xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_textured_video.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit efa0825a86a8dc0f03ebb42c576ed26189e9d4bb
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Apr 21 13:51:11 2009 -0400

    Tex vid: fix top clipping

diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index b6cedb2..ab743be 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -362,7 +362,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
     nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
 
     pPriv->src_offset = pPriv->video_offset + info->fbLocation + pScrn->fbOffset;
-    pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset + (top * dstPitch));
+    pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset);
     pPriv->src_pitch = dstPitch;
 
     pPriv->planeu_offset = dstPitch * dst_height;
@@ -376,8 +376,10 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
     switch(id) {
     case FOURCC_YV12:
     case FOURCC_I420:
-	s2offset = (srcPitch * ((height + 1) & ~1)) + ((top >> 1) * srcPitch2);
-	s3offset = (s2offset + (srcPitch2 * ((height + 1) >> 1))) + ((top >> 1) * srcPitch2);
+	s2offset = srcPitch * ((height + 1) & ~1);
+	s3offset = s2offset + (srcPitch2 * ((height + 1) >> 1));
+	s2offset += ((top >> 1) * srcPitch2);
+	s3offset += ((top >> 1) * srcPitch2);
 	if (pPriv->bicubic_state != BICUBIC_OFF) {
 	    if (id == FOURCC_I420) {
 		tmp = s2offset;