[FFmpeg-cvslog] aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message .

Alex Converse git at videolan.org
Wed Feb 29 01:13:45 CET 2012


ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Thu Feb 23 11:08:47 2012 -0800| [5e239c7f9e57d09c6a4c1d5762f441950f8d979c] | committer: Alex Converse

aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5e239c7f9e57d09c6a4c1d5762f441950f8d979c
---

 libavcodec/aacdec.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index f491a09..186de96 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];



More information about the ffmpeg-cvslog mailing list