diff options
Diffstat (limited to 'libavcodec/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 12475692c6..4c546c22f0 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -260,20 +260,15 @@ static inline void decode_subblock1(DCTELEM *dst, int code, GetBitContext *gb, V decode_coeff(dst, coeff, 3, gb, vlc, q); } -static inline void decode_subblock3(DCTELEM *dst, int code, const int is_block2, GetBitContext *gb, VLC *vlc, +static inline void decode_subblock3(DCTELEM *dst, int code, GetBitContext *gb, VLC *vlc, int q_dc, int q_ac1, int q_ac2) { int flags = modulo_three_table[code]; - decode_coeff( dst+0*4+0, (flags >> 6) , 3, gb, vlc, q_dc); - if(is_block2){ - decode_coeff(dst+1*4+0, (flags >> 4) & 3, 2, gb, vlc, q_ac1); - decode_coeff(dst+0*4+1, (flags >> 2) & 3, 2, gb, vlc, q_ac1); - }else{ - decode_coeff(dst+0*4+1, (flags >> 4) & 3, 2, gb, vlc, q_ac1); - decode_coeff(dst+1*4+0, (flags >> 2) & 3, 2, gb, vlc, q_ac1); - } - decode_coeff( dst+1*4+1, (flags >> 0) & 3, 2, gb, vlc, q_ac2); + decode_coeff(dst+0*4+0, (flags >> 6) , 3, gb, vlc, q_dc); + decode_coeff(dst+0*4+1, (flags >> 4) & 3, 2, gb, vlc, q_ac1); + decode_coeff(dst+1*4+0, (flags >> 2) & 3, 2, gb, vlc, q_ac1); + decode_coeff(dst+1*4+1, (flags >> 0) & 3, 2, gb, vlc, q_ac2); } /** @@ -298,7 +293,7 @@ static inline int rv34_decode_block(DCTELEM *dst, GetBitContext *gb, RV34VLC *rv code >>= 3; if (modulo_three_table[code] & 0x3F) { - decode_subblock3(dst, code, 0, gb, &rvlc->coefficient, q_dc, q_ac1, q_ac2); + decode_subblock3(dst, code, gb, &rvlc->coefficient, q_dc, q_ac1, q_ac2); } else { decode_subblock1(dst, code, gb, &rvlc->coefficient, q_dc); if (!pattern) |