diff options
| author | Paul B Mahol <onemda@gmail.com> | 2021-11-11 09:48:07 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2021-11-11 21:54:32 +0100 |
| commit | 946493eb3e072b499909f606625480c928834a44 (patch) | |
| tree | becf80ee4f09c86019b07611f9ec96bfb465a0be | |
| parent | afcf226b337584f5028265b361d8a5a930696a31 (diff) | |
| download | ffmpeg-946493eb3e072b499909f606625480c928834a44.tar.gz | |
avcodec/mlpdec: cover case when >2 channels are in single substream
Previously it was assumed that all >2 channels streams have >1 substreams.
| -rw-r--r-- | libavcodec/mlpdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 68c270ef52..780ed5b7b6 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -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"); |