diff options
| author | Alex Converse <alex.converse@gmail.com> | 2012-02-23 11:08:47 -0800 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2012-02-27 17:59:47 -0800 |
| commit | 5e239c7f9e57d09c6a4c1d5762f441950f8d979c (patch) | |
| tree | ae5fa86b1823d23dcc5d5b91a7621367f79236e8 /libavcodec/aacdec.c | |
| parent | d10319d87f7f408dc69e1540498e87e2860e945d (diff) | |
| download | ffmpeg-5e239c7f9e57d09c6a4c1d5762f441950f8d979c.tar.gz | |
aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message.
Diffstat (limited to 'libavcodec/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index f491a098c3..186de96856 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -1016,7 +1016,6 @@ static int decode_scalefactors(AACContext *ac, float sf[120], GetBitContext *gb, int offset[3] = { global_gain, global_gain - 90, 0 }; int clipped_offset; int noise_flag = 1; - static const char *const sf_str[3] = { "Global gain", "Noise gain", "Intensity stereo position" }; for (g = 0; g < ics->num_window_groups; g++) { for (i = 0; i < ics->max_sfb;) { int run_end = band_type_run_end[idx]; @@ -1055,7 +1054,7 @@ static int decode_scalefactors(AACContext *ac, float sf[120], GetBitContext *gb, offset[0] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60; if (offset[0] > 255U) { av_log(ac->avctx, AV_LOG_ERROR, - "%s (%d) out of range.\n", sf_str[0], offset[0]); + "Scalefactor (%d) out of range.\n", offset[0]); return -1; } sf[idx] = -ff_aac_pow2sf_tab[offset[0] - 100 + POW_SF2_ZERO]; |