Merge commit '84b223cc6d6ed4cc8bd295457a90f7c94a9dd784'

[ffmpeg] / libavformat / options.c

diff --git a/libavformat/options.c b/libavformat/options.c
index d238dd5ab70d8b34f389422df8a63398e80288c7..9918349703a613a841ea71ea8885fb7eebff946f 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)
 {