summaryrefslogtreecommitdiff
path: root/libavcodec/ac3_parser.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2008-06-07 22:29:45 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2008-06-07 22:29:45 +0000
commit30cc3ac20e1e6cd434bc776932b0897d8a999b0e (patch)
treec1f293ab147eda410e2b5ab342354cf9cda42e57 /libavcodec/ac3_parser.c
parent4921bbbae59a046a4ad38beb9b37f462eb12b242 (diff)
set default mix levels regardless of bitstream id
Originally committed as revision 13693 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ac3_parser.c')
-rw-r--r--libavcodec/ac3_parser.c8
1 files changed, 4 insertions, 4 deletions
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 {