diff options
author | Mans Rullgard <mans@mansr.com> | 2011-01-23 05:22:34 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-23 21:32:09 +0300 |
commit | 91d51ee4b5ea070df991d3dd46a6cca6a64e6155 (patch) | |
tree | d34fd51d8ec6bb802130c46839d6c74e704ec70f /libavcodec/mpeg12.c | |
parent | a4bff12cddc79e47d16ef1e092242ed5c8f1b3b7 (diff) |
Remove redundant checks against MIN_CACHE_BITS
With the removal of the libmpeg2 bitstream reader, MIN_CACHE_BITS
is always >= 25, so tests against smaller values can be removed.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f162e988aa0dc8df93079b5ebf452ec281ab8793)
Diffstat (limited to 'libavcodec/mpeg12.c')
-rw-r--r-- | libavcodec/mpeg12.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index d93474fe29..4aaa40290a 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -718,9 +718,6 @@ static inline int mpeg1_decode_block_inter(MpegEncContext *s, if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) goto end; } -#if MIN_CACHE_BITS < 19 - UPDATE_CACHE(re, &s->gb); -#endif /* now quantify & encode AC coefficients */ for(;;) { GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); @@ -760,14 +757,9 @@ static inline int mpeg1_decode_block_inter(MpegEncContext *s, } block[j] = level; -#if MIN_CACHE_BITS < 19 - UPDATE_CACHE(re, &s->gb); -#endif if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) break; -#if MIN_CACHE_BITS >= 19 UPDATE_CACHE(re, &s->gb); -#endif } end: LAST_SKIP_BITS(re, &s->gb, 2); @@ -800,9 +792,6 @@ static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *bloc if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) goto end; } -#if MIN_CACHE_BITS < 19 - UPDATE_CACHE(re, &s->gb); -#endif /* now quantify & encode AC coefficients */ for(;;) { @@ -839,14 +828,9 @@ static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *bloc } block[j] = level; -#if MIN_CACHE_BITS < 19 - UPDATE_CACHE(re, &s->gb); -#endif if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) break; -#if MIN_CACHE_BITS >= 19 UPDATE_CACHE(re, &s->gb); -#endif } end: LAST_SKIP_BITS(re, &s->gb, 2); @@ -891,9 +875,6 @@ static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) goto end; } -#if MIN_CACHE_BITS < 19 - UPDATE_CACHE(re, &s->gb); -#endif /* now quantify & encode AC coefficients */ for(;;) { @@ -927,14 +908,9 @@ static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, mismatch ^= level; block[j] = level; -#if MIN_CACHE_BITS < 19 - UPDATE_CACHE(re, &s->gb); -#endif if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) break; -#if MIN_CACHE_BITS >= 19 UPDATE_CACHE(re, &s->gb); -#endif } end: LAST_SKIP_BITS(re, &s->gb, 2); @@ -969,9 +945,6 @@ static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) goto end; } -#if MIN_CACHE_BITS < 19 - UPDATE_CACHE(re, &s->gb); -#endif /* now quantify & encode AC coefficients */ for(;;) { @@ -1000,14 +973,9 @@ static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, } block[j] = level; -#if MIN_CACHE_BITS < 19 - UPDATE_CACHE(re, &s->gb); -#endif if(((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) break; -#if MIN_CACHE_BITS >=19 UPDATE_CACHE(re, &s->gb); -#endif } end: LAST_SKIP_BITS(re, &s->gb, 2); |