From bd35d58463f01f7781df052864ae16f5e228c1bc Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 8 Feb 2014 18:13:34 +0100 Subject: avcodec/mlp_parser: fix multichannel Signed-off-by: Michael Niedermayer --- libavcodec/mlp_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/mlp_parser.c') diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index e51efbeef0..39dbcf9673 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -371,8 +371,8 @@ FF_ENABLE_DEPRECATION_WARNINGS avctx->channels = 2; avctx->channel_layout = AV_CH_LAYOUT_STEREO; } else if (!mh.channels_thd_stream2 || - (mh.channel_layout_thd_stream1 & avctx->request_channel_layout) == - avctx->request_channel_layout) { + ((mh.channel_layout_thd_stream1 & avctx->request_channel_layout) == + avctx->request_channel_layout && avctx->request_channel_layout)) { avctx->channels = mh.channels_thd_stream1; avctx->channel_layout = mh.channel_layout_thd_stream1; } else { -- cgit v1.2.3