har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mlpdec: discard a 2nd substream if the stream is mono

Browse Source 
This fixes the rest of Ticket1726

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-09-25 22:36:45 +02:00
parent 2a672652bb
commit eda5db6bd1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mlpdec.c
View File

@ -337,6 +337,10 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
} else { } else {
m->avctx->channel_layout = ff_truehd_layout(mh.channels_thd_stream1); m->avctx->channel_layout = ff_truehd_layout(mh.channels_thd_stream1);
} }
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 && if (m->avctx->channels &&
!m->avctx->request_channels && !m->avctx->request_channel_layout && !m->avctx->request_channels && !m->avctx->request_channel_layout &&
av_get_channel_layout_nb_channels(m->avctx->channel_layout) != m->avctx->channels) { av_get_channel_layout_nb_channels(m->avctx->channel_layout) != m->avctx->channels) {