Commit 4040b56f authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mlp_parser: fix request_channel_layout behavior.

Conflicts:
	libavcodec/mlp_parser.c

See: bd35d584Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 73be2ebe c1e7de8f
...@@ -343,7 +343,9 @@ FF_DISABLE_DEPRECATION_WARNINGS ...@@ -343,7 +343,9 @@ FF_DISABLE_DEPRECATION_WARNINGS
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
} else } else
#endif #endif
if (avctx->request_channel_layout == AV_CH_LAYOUT_STEREO && if (avctx->request_channel_layout &&
(avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) ==
avctx->request_channel_layout &&
mh.num_substreams > 1) { mh.num_substreams > 1) {
avctx->channels = 2; avctx->channels = 2;
avctx->channel_layout = AV_CH_LAYOUT_STEREO; avctx->channel_layout = AV_CH_LAYOUT_STEREO;
...@@ -366,13 +368,16 @@ FF_DISABLE_DEPRECATION_WARNINGS ...@@ -366,13 +368,16 @@ FF_DISABLE_DEPRECATION_WARNINGS
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
} else } else
#endif #endif
if (avctx->request_channel_layout == AV_CH_LAYOUT_STEREO && if (avctx->request_channel_layout &&
mh.num_substreams > 1) { (avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) ==
avctx->request_channel_layout &&
mh.num_substreams > 1) {
avctx->channels = 2; avctx->channels = 2;
avctx->channel_layout = AV_CH_LAYOUT_STEREO; avctx->channel_layout = AV_CH_LAYOUT_STEREO;
} else if (!mh.channels_thd_stream2 || } else if (!mh.channels_thd_stream2 ||
((mh.channel_layout_thd_stream1 & avctx->request_channel_layout) == (avctx->request_channel_layout &&
avctx->request_channel_layout && avctx->request_channel_layout)) { (avctx->request_channel_layout & mh.channel_layout_thd_stream1) ==
avctx->request_channel_layout)) {
avctx->channels = mh.channels_thd_stream1; avctx->channels = mh.channels_thd_stream1;
avctx->channel_layout = mh.channel_layout_thd_stream1; avctx->channel_layout = mh.channel_layout_thd_stream1;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment