xf86-video-ati: Branch 'ati-6.7-branch'

[Dave Airlie]

 src/radeon_video.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
diff-tree 8e3a6f83016cd8c4cfd43ceee4cbf0a8dc018b2a (from 05c90280e2e17348ceacf760451c9c9e45fd70e5)
Author: Roland Bär <roland at verifysoft.de>
Date:   Thu Aug 23 18:37:35 2007 +1000

    radeon: bug 11861 - dead code removal in radeon_video.c

diff --git a/src/radeon_video.c b/src/radeon_video.c
index 2f8bec5..4d59306 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -3376,7 +3376,8 @@ RADEONPutVideo(
    id = FOURCC_YUY2;
    
    top = ya>>16;
-
+#if 0
+   /* setting the ID above makes this useful - needs revisiting */
    switch(id) {
    case FOURCC_YV12:
    case FOURCC_I420:
@@ -3394,6 +3395,10 @@ RADEONPutVideo(
         srcPitch = (width<<1);
         break;
    }
+#else
+   dstPitch = ((width<<1) + 15) & ~15;
+   srcPitch = (width<<1);
+#endif
 
    new_size = dstPitch * height;
    new_size = new_size + 0x1f; /* for aligning */