diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 22:40:41 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 22:40:47 +0300 |
| commit | 3b03186d56794b902050a36516e44191ba07bb05 (patch) | |
| tree | f2ed3a006f0dba894ece074c7440551c9ba29c91 /libavcodec/options.c | |
| parent | d563e13a7c7daa03c89636f85305e1839bcb27be (diff) | |
| parent | f046c3b5ac36848cce824b008e0347c621523041 (diff) | |
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>
Diffstat (limited to 'libavcodec/options.c')
| -rw-r--r-- | libavcodec/options.c | 2 |
1 files changed, 2 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; |