diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 18:13:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 18:13:34 +0100 |
| commit | bd35d58463f01f7781df052864ae16f5e228c1bc (patch) | |
| tree | 6fb4b59dd6650be472afddeda59c7d710b15e00b /libavcodec | |
| parent | 1a8050ad616c9682f44671c6febb6030a8e3b71e (diff) | |
| download | ffmpeg-bd35d58463f01f7781df052864ae16f5e228c1bc.tar.gz | |
avcodec/mlp_parser: fix multichannel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mlp_parser.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 { |