From 7950e519bb094897f957b9a9531cc60ba46cbc91 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 27 Mar 2013 18:36:51 +0100 Subject: Disable deprecation warnings for cases where a replacement is available --- libavcodec/mlpdec.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavcodec/mlpdec.c') 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 #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) { -- cgit v1.2.3