diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 01:19:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 01:19:18 +0100 |
| commit | e802abd6e3090de9c638b87d4b86a3b7ec5bfe59 (patch) | |
| tree | 8b0ce108f53c8a226f5dba43562ead6132c10838 /libavcodec/dcadec.c | |
| parent | 21d25441c6eadda505aa2b7672d01a75d3b55160 (diff) | |
| download | ffmpeg-e802abd6e3090de9c638b87d4b86a3b7ec5bfe59.tar.gz | |
avcodec/dcadec: if XLL is enabled use xll channels
Fixes outputting 14 channels instead of 7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadec.c')
| -rw-r--r-- | libavcodec/dcadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |