xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/atimach64xv.c |    3 +++
 1 files changed, 3 insertions(+)

New commits:
diff-tree 882fe7631586b0a7919f808588a2ea4fb555f7e8 (from ac9cbaf32176cf144bc694ac879e7c9e2920f762)
Author: Brice Goglin <brice.goglin at ens-lyon.org>
Date:   Thu Jul 19 18:44:27 2007 -0400

    MACH64: avoid crash in Xv code
    
    fixes bug 11054

diff --git a/src/atimach64xv.c b/src/atimach64xv.c
index 997fa69..67becec 100644
--- a/src/atimach64xv.c
+++ b/src/atimach64xv.c
@@ -979,6 +979,9 @@ ATIMach64PutImage
     if (pATI->ActiveSurface)
         return Success;
 
+    if (DstH < 16)
+	return Success;
+
     if (!ATIMach64ClipVideo(pScreenInfo, pATI, ImageID,
                             SrcX, SrcY, SrcW, SrcH,
                             DstX, DstY, &DstW, &DstH,