diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 21:40:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 21:40:47 +0200 |
| commit | 3b03186d56794b902050a36516e44191ba07bb05 (patch) | |
| tree | f2ed3a006f0dba894ece074c7440551c9ba29c91 | |
| parent | d563e13a7c7daa03c89636f85305e1839bcb27be (diff) | |
| parent | f046c3b5ac36848cce824b008e0347c621523041 (diff) | |
| download | ffmpeg-3b03186d56794b902050a36516e44191ba07bb05.tar.gz | |
Merge commit 'f046c3b5ac36848cce824b008e0347c621523041'
* commit 'f046c3b5ac36848cce824b008e0347c621523041':
lavc: Move deprecation warning disabling to files including the table
lavc: Disable deprectation warnings coming from options table
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/options.c | 2 | ||||
| -rw-r--r-- | libavformat/options.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 17dca08060..41471de72f 100644 --- 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/libavformat/options.c b/libavformat/options.c index d238dd5ab7..9918349703 100644 --- 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) { |