diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-07-28 14:30:22 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-08-28 16:01:16 +0200 |
| commit | dc70c19476e76f1118df73b5d97cc76f0e5f6f6c (patch) | |
| tree | 2817df885d6faec3a6d87e85b55e1c1cc69388ae /libavcodec/dcadec.c | |
| parent | f6974fe651d29ef6eb68d66d73f7b6c011062aa0 (diff) | |
| download | ffmpeg-dc70c19476e76f1118df73b5d97cc76f0e5f6f6c.tar.gz | |
lavc: Drop deprecated request_channels related functions
Deprecated in 04/2011.
Diffstat (limited to 'libavcodec/dcadec.c')
| -rw-r--r-- | libavcodec/dcadec.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 8fdd03cf7a..abf762d906 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -1307,15 +1307,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data, s->xch_disable = 1; } -#if FF_API_REQUEST_CHANNELS -FF_DISABLE_DEPRECATION_WARNINGS - if (s->xch_present && !s->xch_disable && - (!avctx->request_channels || - avctx->request_channels > num_core_channels + !!s->lfe)) { -FF_ENABLE_DEPRECATION_WARNINGS -#else if (s->xch_present && !s->xch_disable) { -#endif avctx->channel_layout |= AV_CH_BACK_CENTER; if (s->lfe) { avctx->channel_layout |= AV_CH_LOW_FREQUENCY; @@ -1523,12 +1515,6 @@ 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; |