diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-23 08:20:12 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-09 08:36:40 +0100 |
| commit | 2a113695238e7675ab75c5fb9a5f59fc92f2ddd9 (patch) | |
| tree | 551d7e5a1e9dac72df1cac726b14247d45f5c823 | |
| parent | 9d6cf81f02d37d5e5ca334e2fc789abe6236eda1 (diff) | |
| download | ffmpeg-2a113695238e7675ab75c5fb9a5f59fc92f2ddd9.tar.gz | |
lavc: remove disabled FF_API_INTER_THRESHOLD cruft
| -rw-r--r-- | libavcodec/avcodec.h | 7 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 2b79d0b116..6aa7dcab83 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1557,13 +1557,6 @@ typedef struct AVCodecContext { */ int noise_reduction; -#if FF_API_INTER_THRESHOLD - /** - * @deprecated this field is unused - */ - attribute_deprecated int inter_threshold; -#endif - /** * Motion estimation threshold below which no motion estimation is * performed, but instead the user specified motion vectors are used. diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index afb6edaee1..7c81d5e7f1 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -283,9 +283,6 @@ static const AVOption options[]={ {"lmax", "maximum Lagrange factor (VBR)", OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 31*FF_QP2LAMBDA }, 0, INT_MAX, V|E}, {"nr", "noise reduction", OFFSET(noise_reduction), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"rc_init_occupancy", "number of bits which should be loaded into the rc buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#if FF_API_INTER_THRESHOLD -{"inter_threshold", NULL, OFFSET(inter_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif {"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0, UINT_MAX, V|A|E|D, "flags2"}, {"error", NULL, OFFSET(error_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, INT_MAX, V|E|D, "threads"}, diff --git a/libavcodec/version.h b/libavcodec/version.h index 8423b7249d..72a880c280 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -49,9 +49,6 @@ #ifndef FF_API_REQUEST_CHANNELS #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56) #endif -#ifndef FF_API_INTER_THRESHOLD -#define FF_API_INTER_THRESHOLD (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_SUB_ID #define FF_API_SUB_ID (LIBAVCODEC_VERSION_MAJOR < 55) #endif |