From db44b599805fdd96940cf2e5a336f872648bbda1 Mon Sep 17 00:00:00 2001 From: foo86 Date: Wed, 2 Mar 2016 22:31:10 +0300 Subject: avcodec/dca: clear X96 channels if nothing was decoded The first X96 channel set can have more channels than core, causing X96 decoding to be skipped. Clear the number of decoded X96 channels to zero in this rudimentary case. Signed-off-by: Michael Niedermayer --- libavcodec/dca_core.c | 1 + 1 file changed, 1 insertion(+) (limited to 'libavcodec') diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c index 48a8f618f7..d9f1a4ca76 100644 --- a/libavcodec/dca_core.c +++ b/libavcodec/dca_core.c @@ -1760,6 +1760,7 @@ static int parse_x96_frame_exss(DCACoreDecoder *s) return ret; // Channel set data + s->x96_nchannels = 0; for (i = 0, x96_base_ch = 0; i < x96_nchsets; i++) { header_pos = get_bits_count(&s->gb); -- cgit v1.2.3