diff options
| author | Tim Walker <tdskywalker@gmail.com> | 2014-01-17 15:18:45 +0100 |
|---|---|---|
| committer | Tim Walker <tdskywalker@gmail.com> | 2014-01-19 19:12:33 +0100 |
| commit | 1f604f96ea70503caa642f68a85be6074a5b3f46 (patch) | |
| tree | a365349a8d40fdaa6b6346071b58c8e0478da61b /libavcodec | |
| parent | 8b2e5e42bb9d6a59ede5af2e6df4aaf7750d1195 (diff) | |
| download | ffmpeg-1f604f96ea70503caa642f68a85be6074a5b3f46.tar.gz | |
ac3: set default matrix encoding modes in parse_frame_header.
Deduplicates some code.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ac3dec.c | 6 | ||||
| -rw-r--r-- | libavcodec/eac3dec.c | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 87638e7143..584ce1a35a 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; diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index fb6c51bcb8..731735f2c9 100644 --- a/libavcodec/eac3dec.c +++ b/libavcodec/eac3dec.c @@ -341,11 +341,6 @@ int ff_eac3_parse_header(AC3DecodeContext *s) } } - /* default dolby matrix encoding modes */ - s->dolby_surround_mode = AC3_DSURMOD_NOTINDICATED; - s->dolby_surround_ex_mode = AC3_DSUREXMOD_NOTINDICATED; - s->dolby_headphone_mode = AC3_DHEADPHONMOD_NOTINDICATED; - /* mixing metadata */ if (get_bits1(gbc)) { /* center and surround mix levels */ |