From dc70c19476e76f1118df73b5d97cc76f0e5f6f6c Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 28 Jul 2015 14:30:22 +0100 Subject: lavc: Drop deprecated request_channels related functions Deprecated in 04/2011. --- libavcodec/aac_ac3_parser.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'libavcodec/aac_ac3_parser.c') diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index d3da9b7696..806a826ea0 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -84,14 +84,6 @@ get_next: avctx->sample_rate = s->sample_rate; /* (E-)AC-3: allow downmixing to stereo or mono */ -#if FF_API_REQUEST_CHANNELS -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->request_channels == 1) - avctx->request_channel_layout = AV_CH_LAYOUT_MONO; - else if (avctx->request_channels == 2) - avctx->request_channel_layout = AV_CH_LAYOUT_STEREO; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (s->channels > 1 && avctx->request_channel_layout == AV_CH_LAYOUT_MONO) { avctx->channels = 1; -- cgit v1.2.3