diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:42:44 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:42:44 +0200 |
| commit | b27ddffbfb29f456d43c2f155eef5230b940a48b (patch) | |
| tree | 85b29b1913c026ca408711e253f42a8e34a0d320 /libavcodec/aac_ac3_parser.c | |
| parent | 144fb06806664d4f3bc681ed1408383baeb515f4 (diff) | |
| parent | dc70c19476e76f1118df73b5d97cc76f0e5f6f6c (diff) | |
| download | ffmpeg-b27ddffbfb29f456d43c2f155eef5230b940a48b.tar.gz | |
Merge commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c'
* commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c':
lavc: Drop deprecated request_channels related functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/aac_ac3_parser.c')
| -rw-r--r-- | libavcodec/aac_ac3_parser.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 7fefda5ce9..2f7d56807c 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; |