xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_textured_videofuncs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c2834e67df6e143a7d15f373faaddca1dda6b18
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Fri Nov 5 09:30:40 2010 +0100

    Fix incorrect CS size in one textured video path. (Bug #31364)
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=31364 .

diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index 138dfa3..a22c416 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -2181,7 +2181,7 @@ FUNC_NAME(R300PrepareTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
 							  R300_ALU_ALPHA_SEL_C(R300_ALU_ALPHA_0_0)));
 	    }
 	} else {
-	    BEGIN_ACCEL(needgamma ? 28 + 33 : 33);
+	    BEGIN_ACCEL(needgamma ? 28 + 31 : 31);
 	    /* 2 components */
 	    OUT_ACCEL_REG(R300_RS_COUNT,
 			  ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |