diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-01-23 02:22:34 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-01-23 16:41:04 +0000 |
| commit | f162e988aa0dc8df93079b5ebf452ec281ab8793 (patch) | |
| tree | ce33274d0df8f0e221a9029fe5b184a78c78c821 /libavcodec/mpeg4videodec.c | |
| parent | 611a6f59ce91947b25033bb8d0f9311b5c542b05 (diff) | |
| download | ffmpeg-f162e988aa0dc8df93079b5ebf452ec281ab8793.tar.gz | |
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>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index c0d9f8fe3c..d331f0ded0 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1023,12 +1023,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, if(last) i+=192; } else { /* second escape */ -#if MIN_CACHE_BITS < 20 - LAST_SKIP_BITS(re, &s->gb, 2); - UPDATE_CACHE(re, &s->gb); -#else SKIP_BITS(re, &s->gb, 2); -#endif GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2, 1); i+= run + rl->max_run[run>>7][level/qmul] +1; //FIXME opt indexing level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); @@ -1036,12 +1031,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, } } else { /* first escape */ -#if MIN_CACHE_BITS < 19 - LAST_SKIP_BITS(re, &s->gb, 1); - UPDATE_CACHE(re, &s->gb); -#else SKIP_BITS(re, &s->gb, 1); -#endif GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2, 1); i+= run; level = level + rl->max_level[run>>7][(run-1)&63] * qmul;//FIXME opt indexing |