diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 20:31:01 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 20:31:30 +0400 |
| commit | aedc10137de0bdbae01828179bfc0ee61d5fe6b2 (patch) | |
| tree | 841881d8e142607f95d2219ec769ed6d09db71a2 /libavcodec/mlp_parser.c | |
| parent | df98b36aa63cbca7ffdebb43028e125e74cfa93b (diff) | |
| parent | c0c45188e56cfa3050bb39f8299025345b8a204c (diff) | |
Merge commit 'c0c45188e56cfa3050bb39f8299025345b8a204c'
* commit 'c0c45188e56cfa3050bb39f8299025345b8a204c':
mlp: improve request_channel_layout behavior.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlp_parser.c')
| -rw-r--r-- | libavcodec/mlp_parser.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index 79552c6be2..e51efbeef0 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -370,8 +370,9 @@ FF_ENABLE_DEPRECATION_WARNINGS mh.num_substreams > 1) { avctx->channels = 2; avctx->channel_layout = AV_CH_LAYOUT_STEREO; - } else if (avctx->request_channel_layout == mh.channel_layout_thd_stream1 || - !mh.channels_thd_stream2) { + } else if (!mh.channels_thd_stream2 || + (mh.channel_layout_thd_stream1 & avctx->request_channel_layout) == + avctx->request_channel_layout) { avctx->channels = mh.channels_thd_stream1; avctx->channel_layout = mh.channel_layout_thd_stream1; } else { |