diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 10:08:30 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 10:08:30 +0200 |
commit | 20be5e0a0e7563671efe0f085c9f160ff09ba494 (patch) | |
tree | 4db1a4e402d97dae295a0c6607726f0f192c0556 /libavcodec/options_table.h | |
parent | 038c4f65ee6c72f9d1ee4d4e46c74073992fabc8 (diff) | |
parent | 7950e519bb094897f957b9a9531cc60ba46cbc91 (diff) |
Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
Disable deprecation warnings for cases where a replacement is available
Conflicts:
libavcodec/avpacket.c
libavcodec/pthread.c
libavcodec/utils.c
libavdevice/v4l2.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/options_table.h')
-rw-r--r-- | libavcodec/options_table.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index e9cdfc4ac4..727596168b 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -25,6 +25,7 @@ #include <float.h> #include <limits.h> +#include "libavutil/internal.h" #include "libavutil/opt.h" #include "avcodec.h" #include "version.h" @@ -40,6 +41,7 @@ #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}, @@ -382,6 +384,7 @@ 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 |