[FFmpeg-cvslog] avcodec/dcadec: if XLL is enabled use xll channels

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 16 01:19:18 2015 +0100| [e802abd6e3090de9c638b87d4b86a3b7ec5bfe59] | committer: Michael Niedermayer

avcodec/dcadec: if XLL is enabled use xll channels

Fixes outputting 14 channels instead of 7

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e802abd6e3090de9c638b87d4b86a3b7ec5bfe59
---

 libavcodec/dcadec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 1ba9863..548a5f9 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;
         }
     }