---
libavcodec/eac3dec.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c
index e81d926..f41ba10 100644
--- a/libavcodec/eac3dec.c
+++ b/libavcodec/eac3dec.c
@@ -341,8 +341,9 @@ int ff_eac3_parse_header(AC3DecodeContext *s)
}
}
- /* default dolby surround mode */
- s->dolby_surround_mode = AC3_DSURMOD_NOTINDICATED;
+ /* default dolby matrix encoding modes */
+ s->dolby_surround_mode = AC3_DSURMOD_NOTINDICATED;
+ s->dolby_surround_ex_mode = AC3_DSUREXMOD_NOTINDICATED;
/* mixing metadata */
if (get_bits1(gbc)) {
@@ -420,7 +421,7 @@ int ff_eac3_parse_header(AC3DecodeContext *s)
skip_bits(gbc, 2); // skip headphone mode
}
if (s->channel_mode >= AC3_CHMODE_2F2R) {
- skip_bits(gbc, 2); // skip Dolby surround EX mode
+ s->dolby_surround_ex_mode = get_bits(gbc, 2);
}
for (i = 0; i < (s->channel_mode ? 1 : 2); i++) {
if (get_bits1(gbc)) {
--
1.8.3.4 (Apple Git-47)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
