diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 10:08:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 10:08:30 +0200 |
| commit | 20be5e0a0e7563671efe0f085c9f160ff09ba494 (patch) | |
| tree | 4db1a4e402d97dae295a0c6607726f0f192c0556 /libavcodec/mlp_parser.c | |
| parent | 038c4f65ee6c72f9d1ee4d4e46c74073992fabc8 (diff) | |
| parent | 7950e519bb094897f957b9a9531cc60ba46cbc91 (diff) | |
| download | ffmpeg-20be5e0a0e7563671efe0f085c9f160ff09ba494.tar.gz | |
Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
Disable deprecation warnings for cases where a replacement is available
Conflicts:
libavcodec/avpacket.c
libavcodec/pthread.c
libavcodec/utils.c
libavdevice/v4l2.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlp_parser.c')
| -rw-r--r-- | libavcodec/mlp_parser.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index 2cc4b9153a..69a175a07c 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -28,6 +28,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/crc.h" +#include "libavutil/internal.h" #include "get_bits.h" #include "parser.h" #include "mlp_parser.h" @@ -331,11 +332,13 @@ 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 == AV_CH_LAYOUT_STEREO && mh.num_substreams > 1) { @@ -348,6 +351,7 @@ static int mlp_parse(AVCodecParserContext *s, } 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; @@ -357,6 +361,7 @@ static int mlp_parse(AVCodecParserContext *s, 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 == AV_CH_LAYOUT_STEREO && mh.num_substreams > 1) { |