summaryrefslogtreecommitdiff
path: root/libavcodec/ac3dec.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2008-01-05 17:04:57 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2008-01-05 17:04:57 +0000
commit86ad4c7e1b79c7721aa254933d69757adc185ee5 (patch)
tree8625802d385a67eddda6001aa325c027a820225e /libavcodec/ac3dec.c
parent3eca1e6fad56f295fb1ef67cb70aff37ff4936a4 (diff)
remove unneeded variables from AC3HeaderInfo
Originally committed as revision 11419 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ac3dec.c')
-rw-r--r--libavcodec/ac3dec.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 8512c179dd..660d8f64d5 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -341,8 +341,6 @@ static int ac3_parse_header(AC3DecodeContext *s)
/* get decoding parameters from header info */
s->bit_alloc_params.sr_code = hdr.sr_code;
s->channel_mode = hdr.channel_mode;
- center_mix_level = gain_levels[center_levels[hdr.center_mix_level]];
- surround_mix_level = gain_levels[surround_levels[hdr.surround_mix_level]];
s->lfe_on = hdr.lfe_on;
s->bit_alloc_params.sr_shift = hdr.sr_shift;
s->sample_rate = hdr.sample_rate;
@@ -367,9 +365,9 @@ static int ac3_parse_header(AC3DecodeContext *s)
skip_bits(gbc, 2); // skip dsurmod
} else {
if((s->channel_mode & 1) && s->channel_mode != AC3_CHMODE_MONO)
- skip_bits(gbc, 2); // skip cmixlev
+ center_mix_level = gain_levels[center_levels[get_bits(gbc, 2)]];
if(s->channel_mode & 4)
- skip_bits(gbc, 2); // skip surmixlev
+ surround_mix_level = gain_levels[surround_levels[get_bits(gbc, 2)]];
}
skip_bits1(gbc); // skip lfeon