diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:42:44 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:42:44 +0300 |
| commit | b27ddffbfb29f456d43c2f155eef5230b940a48b (patch) | |
| tree | 85b29b1913c026ca408711e253f42a8e34a0d320 /libavcodec/ac3dec.c | |
| parent | 144fb06806664d4f3bc681ed1408383baeb515f4 (diff) | |
| parent | dc70c19476e76f1118df73b5d97cc76f0e5f6f6c (diff) | |
Merge commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c'
* commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c':
lavc: Drop deprecated request_channels related functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/ac3dec.c')
| -rw-r--r-- | libavcodec/ac3dec.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 398224753f..6df697e855 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -208,14 +208,6 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx) avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; /* 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 (avctx->channels > 1 && avctx->request_channel_layout == AV_CH_LAYOUT_MONO) avctx->channels = 1; |