diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-10-08 13:41:23 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-10-08 20:03:55 +0100 |
| commit | d12294304acd82cb219e3f66ca9cd6efb2194fa4 (patch) | |
| tree | fed931c2c65620ccf84bf088167a9e7ac724650f | |
| parent | a00676e48e49a3d794d6d2063ceca539e945a4a4 (diff) | |
| download | ffmpeg-d12294304acd82cb219e3f66ca9cd6efb2194fa4.tar.gz | |
aacdec: fix undefined shifts
Since nnz can be zero, this is needed to avoid a shift by 32.
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | libavcodec/aacdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index ef5daed5ca..8e7e74e10d 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -1129,7 +1129,7 @@ static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024], GET_VLC(code, re, gb, vlc_tab, 8, 2); cb_idx = cb_vector_idx[code]; nnz = cb_idx >> 8 & 15; - bits = SHOW_UBITS(re, gb, nnz) << (32-nnz); + bits = nnz ? GET_CACHE(re, gb) : 0; LAST_SKIP_BITS(re, gb, nnz); cf = VMUL4S(cf, vq, cb_idx, bits, sf + idx); } while (len -= 4); @@ -1169,7 +1169,7 @@ static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024], GET_VLC(code, re, gb, vlc_tab, 8, 2); cb_idx = cb_vector_idx[code]; nnz = cb_idx >> 8 & 15; - sign = SHOW_UBITS(re, gb, nnz) << (cb_idx >> 12); + sign = nnz ? SHOW_UBITS(re, gb, nnz) << (cb_idx >> 12) : 0; LAST_SKIP_BITS(re, gb, nnz); cf = VMUL2S(cf, vq, cb_idx, sign, sf + idx); } while (len -= 2); |