diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-20 00:18:13 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-20 00:18:18 +0400 |
| commit | c3d12156839475510e38df0bc3777a8781a3e7a8 (patch) | |
| tree | 590ec8444ea401636e9ce3edf470f319da586a52 /libavcodec/eac3dec.c | |
| parent | 9d13432a90979de8e21bff4641c1da3dbac02584 (diff) | |
| parent | 1f604f96ea70503caa642f68a85be6074a5b3f46 (diff) | |
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/eac3dec.c')
| -rw-r--r-- | libavcodec/eac3dec.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index 8463b4e78a..2f6a15b8fd 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 */ |