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/mlp_parser.c | |
| parent | 144fb06806664d4f3bc681ed1408383baeb515f4 (diff) | |
| parent | dc70c19476e76f1118df73b5d97cc76f0e5f6f6c (diff) | |
| download | ffmpeg-streaming-b27ddffbfb29f456d43c2f155eef5230b940a48b.zip ffmpeg-streaming-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/mlp_parser.c')
| -rw-r--r-- | libavcodec/mlp_parser.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index deaa844..23601c8 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -357,15 +357,6 @@ static int mlp_parse(AVCodecParserContext *s, if(!avctx->channels || !avctx->channel_layout) { if (mh.stream_type == 0xbb) { /* MLP stream */ -#if FF_API_REQUEST_CHANNELS -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->request_channels > 0 && avctx->request_channels <= 2 && - mh.num_substreams > 1) { - avctx->channels = 2; - avctx->channel_layout = AV_CH_LAYOUT_STEREO; -FF_ENABLE_DEPRECATION_WARNINGS - } else -#endif if (avctx->request_channel_layout && (avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) == avctx->request_channel_layout && @@ -378,20 +369,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } } else { /* mh.stream_type == 0xba */ /* TrueHD stream */ -#if FF_API_REQUEST_CHANNELS -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->request_channels > 0 && avctx->request_channels <= 2 && - mh.num_substreams > 1) { - avctx->channels = 2; - avctx->channel_layout = AV_CH_LAYOUT_STEREO; - } else if (avctx->request_channels > 0 && - avctx->request_channels <= mh.channels_thd_stream1) { - avctx->channels = mh.channels_thd_stream1; - avctx->channel_layout = mh.channel_layout_thd_stream1; -FF_ENABLE_DEPRECATION_WARNINGS - } else -#endif - if (avctx->request_channel_layout && + if (avctx->request_channel_layout && (avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) == avctx->request_channel_layout && mh.num_substreams > 1) { |
