diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 16:48:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 16:48:31 +0200 |
| commit | 83db013a063b67e86c3fc0d77d72a0ac76302974 (patch) | |
| tree | bb4c58f205ecb717a698fb3329b25de742964c00 /libavcodec | |
| parent | f5b2718c0ae53459fbd506419884068687278583 (diff) | |
| parent | 0ba4ea312b2a6bebbdd7ff228d46385159c63c9f (diff) | |
| download | ffmpeg-83db013a063b67e86c3fc0d77d72a0ac76302974.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec/options: Drop deprecation warning suppression macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/options_table.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 727596168b..e9cdfc4ac4 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -25,7 +25,6 @@ #include <float.h> #include <limits.h> -#include "libavutil/internal.h" #include "libavutil/opt.h" #include "avcodec.h" #include "version.h" @@ -41,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 }, 0, INT_MAX, A|V|E}, {"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT, {.i64 = 128*1000 }, 0, INT_MAX, A|E}, @@ -384,7 +382,6 @@ static const AVOption avcodec_options[] = { {"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, A|V|D }, {NULL}, }; -FF_ENABLE_DEPRECATION_WARNINGS #undef A #undef V |