diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-25 22:45:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-25 22:45:52 +0200 |
| commit | c5e2347373453c61790e413a0fe0f1e6b4d65882 (patch) | |
| tree | 02660a714bfef920a9783f19e80a4f44d8149680 /libavcodec/mlpdec.c | |
| parent | eda5db6bd1f9a9e35353bf96f1e1fb8f15a2b7ad (diff) | |
| download | ffmpeg-c5e2347373453c61790e413a0fe0f1e6b4d65882.tar.gz | |
mlpdec: supress layout mismatch warnings for 2 ch upmixed mono
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlpdec.c')
| -rw-r--r-- | libavcodec/mlpdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 141096b2f5..ccd09b675c 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -340,6 +340,8 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb) if (m->avctx->channels<=2 && m->avctx->channel_layout == AV_CH_LAYOUT_MONO && m->max_decoded_substream == 1) { av_log(m->avctx, AV_LOG_DEBUG, "Mono stream with 2 substreams, ignoring 2nd\n"); m->max_decoded_substream = 0; + if (m->avctx->channels==2) + m->avctx->channel_layout = AV_CH_LAYOUT_STEREO; } if (m->avctx->channels && !m->avctx->request_channels && !m->avctx->request_channel_layout && |