From f046c3b5ac36848cce824b008e0347c621523041 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Fri, 3 Jul 2015 19:25:30 +0100 Subject: lavc: Move deprecation warning disabling to files including the table Unbreak build from 7a5902c556d84a367dd64a003a4e7244fc3a73d1. Signed-off-by: Luca Barbato --- libavcodec/options.c | 2 ++ libavcodec/options_table.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/options.c b/libavcodec/options.c index c00dca078e..a433f25eb9 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -33,7 +33,9 @@ #include /* FLT_MIN, FLT_MAX */ #include +FF_DISABLE_DEPRECATION_WARNINGS #include "options_table.h" +FF_ENABLE_DEPRECATION_WARNINGS static const char* context_to_name(void* ptr) { AVCodecContext *avc= ptr; diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 66cfc7498c..ee8f32847a 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -40,7 +40,6 @@ #define AV_CODEC_DEFAULT_BITRATE 200*1000 -FF_DISABLE_DEPRECATION_WARNINGS static const AVOption avcodec_options[] = { {"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT, {.i64 = AV_CODEC_DEFAULT_BITRATE }, INT_MIN, INT_MAX, V|A|E}, {"bt", "Set video bitrate tolerance (in bits/s). In 1-pass mode, bitrate tolerance specifies how far " @@ -476,7 +475,6 @@ static const AVOption avcodec_options[] = { {"side_data_only_packets", NULL, OFFSET(side_data_only_packets), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, A|V|E }, {NULL}, }; -FF_DISABLE_DEPRECATION_WARNINGS #undef A #undef V -- cgit v1.2.3