From f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 8 Feb 2014 17:21:13 +0000 Subject: [PATCH] mlpdec: fix request_channel_layout behavior. When request_channel_layout is 0, all substreams should be decoded. Signed-off-by: Tim Walker --- libavcodec/mlpdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index d8a76f554a..ed5a6ac2fc 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -504,7 +504,7 @@ FF_DISABLE_DEPRECATION_WARNINGS } else FF_ENABLE_DEPRECATION_WARNINGS #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. " -- 2.11.0