[SCM] libav/experimental: remove unneeded variable from AC3DecodeContext

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:11:25 UTC 2013


The following commit has been merged in the experimental branch:
commit 82a6c4811a2c0aa93efa41749ba3950c3829068e
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Sun Jan 6 23:56:19 2008 +0000

    remove unneeded variable from AC3DecodeContext
    
    Originally committed as revision 11439 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index c1b3ec2..bd70069 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -135,7 +135,6 @@ typedef struct {
     int phase_flags_in_use;                 ///< phase flags in use
     int phase_flags[18];                    ///< phase flags
     int cpl_band_struct[18];                ///< coupling band structure
-    int rematrixing_strategy;               ///< rematrixing strategy
     int num_rematrixing_bands;              ///< number of rematrixing bands
     int rematrixing_flags[4];               ///< rematrixing flags
     int exp_strategy[AC3_MAX_CHANNELS];     ///< exponent strategies
@@ -880,8 +879,7 @@ static int ac3_parse_audio_block(AC3DecodeContext *s, int blk)
 
     /* stereo rematrixing strategy and band structure */
     if (channel_mode == AC3_CHMODE_STEREO) {
-        s->rematrixing_strategy = get_bits1(gbc);
-        if (s->rematrixing_strategy) {
+        if (get_bits1(gbc)) {
             s->num_rematrixing_bands = 4;
             if(s->cpl_in_use && s->start_freq[CPL_CH] <= 61)
                 s->num_rematrixing_bands -= 1 + (s->start_freq[CPL_CH] == 37);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list