diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 17:21:13 +0000 |
|---|---|---|
| committer | Tim Walker <tdskywalker@gmail.com> | 2014-02-08 20:10:35 +0100 |
| commit | f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f (patch) | |
| tree | ac746e4d01087b8ed043cb2f73d89adb23672418 /libavcodec/mlpdec.c | |
| parent | cde7df25ef74b85b5ce11d9171779f28f0c12d15 (diff) | |
| download | android_external_ffmpeg-f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f.tar.gz android_external_ffmpeg-f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f.tar.bz2 android_external_ffmpeg-f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f.zip | |
mlpdec: fix request_channel_layout behavior.
When request_channel_layout is 0,
all substreams should be decoded.
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
Diffstat (limited to 'libavcodec/mlpdec.c')
| -rw-r--r-- | libavcodec/mlpdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index d8a76f554a..ed5a6ac2fc 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -504,7 +504,7 @@ FF_DISABLE_DEPRECATION_WARNINGS } else FF_ENABLE_DEPRECATION_WARNINGS #endif - if ((s->ch_layout & m->avctx->request_channel_layout) == + if (m->avctx->request_channel_layout && (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. " |