diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-03-27 18:36:51 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-08-02 19:19:02 +0200 |
| commit | 7950e519bb094897f957b9a9531cc60ba46cbc91 (patch) | |
| tree | b8bcd2acc2a699c2c219e690d439a3f3eb0a6a44 /libavcodec/mlpdec.c | |
| parent | 3a7050ffed5ce061b114a11e4de4b77aba8efa0b (diff) | |
| download | android_external_ffmpeg-7950e519bb094897f957b9a9531cc60ba46cbc91.tar.gz android_external_ffmpeg-7950e519bb094897f957b9a9531cc60ba46cbc91.tar.bz2 android_external_ffmpeg-7950e519bb094897f957b9a9531cc60ba46cbc91.zip | |
Disable deprecation warnings for cases where a replacement is available
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 73f51c5e40..3224cfb17d 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" @@ -449,6 +450,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) { @@ -458,6 +460,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) { |