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/mlpdec.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/mlpdec.c')
| -rw-r--r-- | libavcodec/mlpdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 610cfece21..1722de6131 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -27,6 +27,7 @@ #include <stdint.h> #include "avcodec.h" +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/channel_layout.h" #include "get_bits.h" @@ -461,6 +462,7 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, 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) { @@ -470,6 +472,7 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, s->max_channel + 1, substr); m->max_decoded_substream = substr; } else +FF_ENABLE_DEPRECATION_WARNINGS #endif if (m->avctx->request_channel_layout == s->ch_layout && m->max_decoded_substream > substr) { |