On 02/08/2014 01:21 PM, Tim Walker wrote: > From: Michael Niedermayer <[email protected]> > > When request_channel_layout is 0, > all substreams should be decoded. > > Signed-off-by: Tim Walker <[email protected]> > --- > libavcodec/mlpdec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c > index d8a76f5..ed5a6ac 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. "
Both patches look ok. -Justin _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
