xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_textured_videofuncs.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 793e1b0ea579cce7489aee57a95f20384d6ecce8
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Dec 6 09:21:19 2012 -0500

    radeon: fix ring count in R300PrepareTexturedVideo
    
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=31364
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index d30f734..c1bdc65 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -1686,7 +1686,7 @@ R300PrepareTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
 	}
 
 	if (pPriv->is_planar) {
-	    BEGIN_RING(2*needgamma ? 28 + 33 : 33);
+	    BEGIN_RING(2 * (needgamma ? (28 + 33) : 33));
 	    /* 2 components: same 2 for tex0/1/2 */
 	    OUT_RING_REG(R300_RS_COUNT,
 			  ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |
@@ -1910,7 +1910,7 @@ R300PrepareTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
 							  R300_ALU_ALPHA_SEL_C(R300_ALU_ALPHA_0_0)));
 	    }
 	} else {
-	    BEGIN_RING(2*needgamma ? 28 + 31 : 31);
+	    BEGIN_RING(2 * (needgamma ? (28 + 31) : 31));
 	    /* 2 components */
 	    OUT_RING_REG(R300_RS_COUNT,
 			  ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |