diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 21:18:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 21:18:18 +0100 |
| commit | c3d12156839475510e38df0bc3777a8781a3e7a8 (patch) | |
| tree | 590ec8444ea401636e9ce3edf470f319da586a52 /libavcodec/ac3dec.c | |
| parent | 9d13432a90979de8e21bff4641c1da3dbac02584 (diff) | |
| parent | 1f604f96ea70503caa642f68a85be6074a5b3f46 (diff) | |
| download | ffmpeg-c3d12156839475510e38df0bc3777a8781a3e7a8.tar.gz | |
Merge commit '1f604f96ea70503caa642f68a85be6074a5b3f46'
* commit '1f604f96ea70503caa642f68a85be6074a5b3f46':
ac3: set default matrix encoding modes in parse_frame_header.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3dec.c')
| -rw-r--r-- | libavcodec/ac3dec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 8a041d69e9..a8e929bc64 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -227,10 +227,6 @@ static int ac3_parse_header(AC3DecodeContext *s) skip_bits(gbc, 2); //skip copyright bit and original bitstream bit - /* default dolby matrix encoding modes */ - s->dolby_surround_ex_mode = AC3_DSUREXMOD_NOTINDICATED; - s->dolby_headphone_mode = AC3_DHEADPHONMOD_NOTINDICATED; - /* skip the timecodes or parse the Alternate Bit Stream Syntax TODO: read & use the xbsi1 downmix levels */ if (s->bitstream_id != 6) { @@ -290,6 +286,8 @@ static int parse_frame_header(AC3DecodeContext *s) s->frame_type = hdr.frame_type; s->substreamid = hdr.substreamid; s->dolby_surround_mode = hdr.dolby_surround_mode; + s->dolby_surround_ex_mode = AC3_DSUREXMOD_NOTINDICATED; + s->dolby_headphone_mode = AC3_DHEADPHONMOD_NOTINDICATED; if (s->lfe_on) { s->start_freq[s->lfe_ch] = 0; |