diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 17:31:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 17:31:30 +0100 |
| commit | aedc10137de0bdbae01828179bfc0ee61d5fe6b2 (patch) | |
| tree | 841881d8e142607f95d2219ec769ed6d09db71a2 /libavcodec/mlpdec.c | |
| parent | df98b36aa63cbca7ffdebb43028e125e74cfa93b (diff) | |
| parent | c0c45188e56cfa3050bb39f8299025345b8a204c (diff) | |
| download | ffmpeg-aedc10137de0bdbae01828179bfc0ee61d5fe6b2.tar.gz | |
Merge commit 'c0c45188e56cfa3050bb39f8299025345b8a204c'
* commit 'c0c45188e56cfa3050bb39f8299025345b8a204c':
mlp: improve request_channel_layout behavior.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlpdec.c')
| -rw-r--r-- | libavcodec/mlpdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index bf2507de5a..d3850b102f 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -528,8 +528,8 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS } else #endif - if (m->avctx->request_channel_layout == s->ch_layout && - m->max_decoded_substream > substr) { + if ((s->ch_layout & m->avctx->request_channel_layout) == + m->avctx->request_channel_layout && m->max_decoded_substream > substr) { av_log(m->avctx, AV_LOG_DEBUG, "Extracting %d-channel downmix (0x%"PRIx64") from substream %d. " "Further substreams will be skipped.\n", |