diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2008-11-20 14:07:37 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2008-11-20 14:07:37 +0000 |
| commit | cd9827912609c9a99a4b906b6150d203876b72be (patch) | |
| tree | 4d4d27b9d0e58c6a4c31f1cc81a13e5ab2123a2b /libavcodec/rv34.c | |
| parent | 78a0fa8c8ff70a55e002f5aa00267d46e9c303d0 (diff) | |
33l Fix applying residue condition in RV30/40 decoder
Originally committed as revision 15891 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 88fa6b489e..3b22834e99 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1046,7 +1046,7 @@ static int rv34_decode_mb_header(RV34DecContext *r, int8_t *intra_types) * 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 @@ static void rv34_apply_differences(RV34DecContext *r, int cbp) 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); |