[FFmpeg-cvslog] avcodec/mlp_parser: fix multichannel

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb  8 18:13:34 2014 +0100| [bd35d58463f01f7781df052864ae16f5e228c1bc] | committer: Michael Niedermayer

avcodec/mlp_parser: fix multichannel

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd35d58463f01f7781df052864ae16f5e228c1bc
---

 libavcodec/mlp_parser.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c
index e51efbe..39dbcf9 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 {