RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-30 19:34:43 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/mlpdec: cover case when >2 channels are in single substream

Browse Source 
Previously it was assumed that all >2 channels streams have >1 substreams.
This commit is contained in:
Paul B Mahol 2021-11-11 09:48:07 +01:00
parent afcf226b33
commit 946493eb3e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mlpdec.c
View File

@ -417,7 +417,8 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
m->substream[2].mask = mh.channel_layout_thd_stream2;
else
m->substream[2].mask = mh.channel_layout_thd_stream1;
m->substream[1].mask = mh.channel_layout_thd_stream1;
if (m->avctx->channels > 2)
m->substream[mh.num_substreams > 1].mask = mh.channel_layout_thd_stream1;
if (m->avctx->channels<=2 && m->substream[substr].mask == AV_CH_LAYOUT_MONO && m->max_decoded_substream == 1) {
av_log(m->avctx, AV_LOG_DEBUG, "Mono stream with 2 substreams, ignoring 2nd\n");