On Mon, 18 Nov 2013 12:41:45 +0100, Tim Walker <[email protected]> wrote: > --- > libavcodec/dcadec.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c > index 8835133..2f9519b 100644 > --- a/libavcodec/dcadec.c > +++ b/libavcodec/dcadec.c > @@ -1805,8 +1805,12 @@ static int dca_decode_frame(AVCodecContext *avctx, > void *data, > avctx->channel_layout = dca_core_channel_layout[s->amode]; > > if (s->xch_present && > +#if FF_API_REQUEST_CHANNELS > +FF_DISABLE_DEPRECATION_WARNINGS > (!avctx->request_channels || > avctx->request_channels > num_core_channels + !!s->lfe) && > +FF_ENABLE_DEPRECATION_WARNINGS > +#endif > (!avctx->request_channel_layout || > avctx->request_channel_layout & AV_CH_BACK_CENTER)) { > avctx->channel_layout |= AV_CH_BACK_CENTER; > @@ -1927,8 +1931,12 @@ static av_cold int dca_decode_init(AVCodecContext > *avctx) > avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; > > /* allow downmixing to stereo */ > +#if FF_API_REQUEST_CHANNELS > +FF_DISABLE_DEPRECATION_WARNINGS > if (avctx->request_channels == 2) > avctx->request_channel_layout = AV_CH_LAYOUT_STEREO; > +FF_ENABLE_DEPRECATION_WARNINGS > +#endif > if (avctx->channels > 2 && > avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) > avctx->channels = 2; > -- > 1.8.3.4 (Apple Git-47) >
Ah, I see you're doing this in a separate patch. I'd squash it with previous, but either way works for me. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
