From e802abd6e3090de9c638b87d4b86a3b7ec5bfe59 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 16 Mar 2015 01:19:18 +0100 Subject: [PATCH] avcodec/dcadec: if XLL is enabled use xll channels Fixes outputting 14 channels instead of 7 Signed-off-by: Michael Niedermayer --- libavcodec/dcadec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 1ba9863c62..548a5f9978 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -1808,7 +1808,7 @@ FF_ENABLE_DEPRECATION_WARNINGS /* If downmixing to stereo, don't decode additional channels. * FIXME: Using the xch_disable flag for this doesn't seem right. */ if (!s->xch_disable) - channels += s->xll_channels - s->xll_residual_channels; + channels = s->xll_channels; } }