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/mlpdec.c | |
| parent | 144fb06806664d4f3bc681ed1408383baeb515f4 (diff) | |
| parent | dc70c19476e76f1118df73b5d97cc76f0e5f6f6c (diff) | |
| download | android_external_ffmpeg-b27ddffbfb29f456d43c2f155eef5230b940a48b.tar.gz android_external_ffmpeg-b27ddffbfb29f456d43c2f155eef5230b940a48b.tar.bz2 android_external_ffmpeg-b27ddffbfb29f456d43c2f155eef5230b940a48b.zip | |
Merge commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c'
* commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c':
lavc: Drop deprecated request_channels related functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/mlpdec.c')
| -rw-r--r-- | libavcodec/mlpdec.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 1687ce80b7..b2d1e2f715 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -533,19 +533,6 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, s->max_channel = max_channel; s->max_matrix_channel = max_matrix_channel; -#if FF_API_REQUEST_CHANNELS -FF_DISABLE_DEPRECATION_WARNINGS - if (m->avctx->request_channels > 0 && - m->avctx->request_channels <= s->max_channel + 1 && - m->max_decoded_substream > substr) { - av_log(m->avctx, AV_LOG_DEBUG, - "Extracting %d-channel downmix from substream %d. " - "Further substreams will be skipped.\n", - s->max_channel + 1, substr); - m->max_decoded_substream = substr; -FF_ENABLE_DEPRECATION_WARNINGS - } else -#endif if (m->avctx->request_channel_layout && (s->ch_layout & m->avctx->request_channel_layout) == m->avctx->request_channel_layout && m->max_decoded_substream > substr) { av_log(m->avctx, AV_LOG_DEBUG, |