# HG changeset patch
# User kostya
# Date 1227190057 0
# Node ID d8f516ca00021a3d09187f23e2fc7a54c32dcb7b
# Parent  f4a291734ad7ec72a42845e97f535ff6d8d96b07
33l Fix applying residue condition in RV30/40 decoder

diff -r f4a291734ad7 -r d8f516ca0002 rv34.c
--- a/rv34.c	Thu Nov 20 14:05:29 2008 +0000
+++ b/rv34.c	Thu Nov 20 14:07:37 2008 +0000
@@ -1046,7 +1046,7 @@
  * mask for retrieving all bits in coded block pattern
  * corresponding to one 8x8 block
  */
-#define LUMA_CBP_BLOCK_MASK 0x303
+#define LUMA_CBP_BLOCK_MASK 0x33
 
 #define U_CBP_MASK 0x0F0000
 #define V_CBP_MASK 0xF00000
@@ -1059,7 +1059,7 @@
     int i;
 
     for(i = 0; i < 4; i++)
-        if(cbp & (LUMA_CBP_BLOCK_MASK << shifts[i]))
+        if((cbp & (LUMA_CBP_BLOCK_MASK << shifts[i])) || r->block_type == RV34_MB_P_MIX16x16)
             s->dsp.add_pixels_clamped(s->block[i], s->dest[0] + (i & 1)*8 + (i&2)*4*s->linesize, s->linesize);
     if(cbp & U_CBP_MASK)
         s->dsp.add_pixels_clamped(s->block[4], s->dest[1], s->uvlinesize);