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/aacdec.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/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index fa527da37c..e6d32f4a73 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -1062,9 +1062,6 @@ static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024], UPDATE_CACHE(re, gb); GET_VLC(code, re, gb, vlc_tab, 8, 2); -#if MIN_CACHE_BITS < 20 - UPDATE_CACHE(re, gb); -#endif cb_idx = cb_vector_idx[code]; nnz = cb_idx >> 8 & 15; bits = SHOW_UBITS(re, gb, nnz) << (32-nnz); @@ -1157,12 +1154,7 @@ static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024], return -1; } -#if MIN_CACHE_BITS < 21 - LAST_SKIP_BITS(re, gb, b + 1); - UPDATE_CACHE(re, gb); -#else SKIP_BITS(re, gb, b + 1); -#endif b += 4; n = (1 << b) + SHOW_UBITS(re, gb, b); LAST_SKIP_BITS(re, gb, b); |