[SCM] libav/experimental: AAC: Simplify some logic from r19956. (The escape codebook is unsigned.)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:51:37 UTC 2013


The following commit has been merged in the experimental branch:
commit 5419da8d9c09579172346f87424792180baa0d8c
Author: Alex Converse <alex.converse at gmail.com>
Date:   Tue Sep 22 01:34:42 2009 +0000

    AAC: Simplify some logic from r19956. (The escape codebook is unsigned.)
    
    Originally committed as revision 19958 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index 31bfe5b..d63d99f 100644
--- a/libavcodec/aac.c
+++ b/libavcodec/aac.c
@@ -927,7 +927,7 @@ static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024],
                     if (is_cb_unsigned && cur_band_type != ESC_BT) {
                         ac->dsp.vector_fmul_sv_scalar[dim>>2](
                             cf, cf, vq, sf[idx], len);
-                    } else if (is_cb_unsigned && cur_band_type == ESC_BT) {
+                    } else if (cur_band_type == ESC_BT) {
                         ac->dsp.vector_fmul_scalar(cf, cf, sf[idx], len);
                     } else {    /* !is_cb_unsigned */
                         ac->dsp.sv_fmul_scalar[dim>>2](cf, vq, sf[idx], len);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list