diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 18:08:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 18:08:01 +0100 |
| commit | 1a8050ad616c9682f44671c6febb6030a8e3b71e (patch) | |
| tree | 4e22f551ddb920e429880fd4823fda818381f34e /libavcodec/mlpdec.c | |
| parent | aedc10137de0bdbae01828179bfc0ee61d5fe6b2 (diff) | |
| download | ffmpeg-1a8050ad616c9682f44671c6febb6030a8e3b71e.tar.gz | |
avcodec/mlpdec: fix mulichannel output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlpdec.c')
| -rw-r--r-- | libavcodec/mlpdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index d3850b102f..93ed55212f 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -528,7 +528,7 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS } else #endif - if ((s->ch_layout & m->avctx->request_channel_layout) == + if (m->avctx->request_channel_layout && (s->ch_layout & m->avctx->request_channel_layout) == m->avctx->request_channel_layout && m->max_decoded_substream > substr) { av_log(m->avctx, AV_LOG_DEBUG, "Extracting %d-channel downmix (0x%"PRIx64") from substream %d. " |