Browse Source
Merge remote-tracking branch 'qatar/master'
* qatar/master: avcodec/options: Drop deprecation warning suppression macros Merged-by: Michael Niedermayer <michaelni@gmx.at>tags/n2.1
Michael Niedermayer
12 years ago
1 changed files with 0 additions and 3 deletions
Unified View
Diff Options
+ 0
- 3
libavcodec/options_table.h
View File
| @@ -25,7 +25,6 @@ | |||||
| #include <float.h> | #include <float.h> | ||||
| #include <limits.h> | #include <limits.h> | ||||
| #include "libavutil/internal.h" | |||||
| #include "libavutil/opt.h" | #include "libavutil/opt.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "version.h" | #include "version.h" | ||||
| @@ -41,7 +40,6 @@ | |||||
| #define AV_CODEC_DEFAULT_BITRATE 200*1000 | #define AV_CODEC_DEFAULT_BITRATE 200*1000 | ||||
| FF_DISABLE_DEPRECATION_WARNINGS | |||||
| static const AVOption avcodec_options[] = { | 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}, | {"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}, | {"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 }, | {"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, A|V|D }, | ||||
| {NULL}, | {NULL}, | ||||
| }; | }; | ||||
| FF_ENABLE_DEPRECATION_WARNINGS | |||||
| #undef A | #undef A | ||||
| #undef V | #undef V | ||||