From 1a8050ad616c9682f44671c6febb6030a8e3b71e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 8 Feb 2014 18:08:01 +0100 Subject: [PATCH] avcodec/mlpdec: fix mulichannel output Signed-off-by: Michael Niedermayer --- libavcodec/mlpdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. "