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/mlp_parser.c | |
| parent | f6974fe651d29ef6eb68d66d73f7b6c011062aa0 (diff) | |
lavc: Drop deprecated request_channels related functions
Deprecated in 04/2011.
Diffstat (limited to 'libavcodec/mlp_parser.c')
| -rw-r--r-- | libavcodec/mlp_parser.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index 0c7d4a2c7a..e8fb4f5f4d 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -345,15 +345,6 @@ static int mlp_parse(AVCodecParserContext *s, 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; - } else -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (avctx->request_channel_layout && (avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) == avctx->request_channel_layout && @@ -366,19 +357,6 @@ 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; - } else -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (avctx->request_channel_layout && (avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) == avctx->request_channel_layout && |