lavc: Move deprecation warning disabling to files including the table

Unbreak build from 7a5902c556d84a367dd64a003a4e7244fc3a73d1.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

diff --git a/libavcodec/options.c b/libavcodec/options.c
index c00dca078e59b1d52b4ae9ee5485e1c5dde22058..a433f25eb9565a62c87fe27014d6ad57fcbb39b1 100644 (file)
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -33,7 +33,9 @@
 #include <float.h>              /* FLT_MIN, FLT_MAX */
 #include <string.h>
 
+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 66cfc7498c0a029f3194627162146cbe02cc2c15..ee8f32847a0708d32817163ad8bd68551bae891a 100644 (file)
--- 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

diff --git a/libavformat/options.c b/libavformat/options.c
index 996dc31274ff1a2ba1f587f79e9e481bfbe1988a..a6fbbd262361a3302622e62d1ae534d52102cf79 100644 (file)
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -20,6 +20,8 @@
 #include "avformat.h"
 #include "avio_internal.h"
 #include "internal.h"
+
+#include "libavutil/internal.h"
 #include "libavutil/opt.h"
 
 /**
@@ -27,7 +29,9 @@
  * Options definition for AVFormatContext.
  */
 
+FF_DISABLE_DEPRECATION_WARNINGS
 #include "options_table.h"
+FF_ENABLE_DEPRECATION_WARNINGS
 
 static const char* format_to_name(void* ptr)
 {