From 30cc3ac20e1e6cd434bc776932b0897d8a999b0e Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sat, 7 Jun 2008 22:29:45 +0000 Subject: set default mix levels regardless of bitstream id Originally committed as revision 13693 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/ac3_parser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavcodec/ac3_parser.c') diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index 7e6bea14c9..c8a09b915b 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -63,6 +63,10 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) hdr->num_blocks = 6; + /* set default mix levels */ + hdr->center_mix_level = 3; // -4.5dB + hdr->surround_mix_level = 4; // -6.0dB + if(hdr->bitstream_id <= 10) { /* Normal AC-3 */ hdr->crc1 = get_bits(gbc, 16); @@ -79,10 +83,6 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) skip_bits(gbc, 3); // skip bitstream mode hdr->channel_mode = get_bits(gbc, 3); - /* set default mix levels */ - hdr->center_mix_level = 3; // -4.5dB - hdr->surround_mix_level = 4; // -6.0dB - if(hdr->channel_mode == AC3_CHMODE_STEREO) { skip_bits(gbc, 2); // skip dsurmod } else { -- cgit v1.2.3