diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-02-27 19:58:41 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-02-29 07:25:44 +0100 |
| commit | 16b7557b794c6cd47c5a256a246f8c930c01eef7 (patch) | |
| tree | 4336eca7bbaf2627010f0f6ec3a70f27109472f7 /libavcodec | |
| parent | 4f07f8196c23cf49cc074eef65ab50134085018f (diff) | |
| download | ffmpeg-16b7557b794c6cd47c5a256a246f8c930c01eef7.tar.gz | |
lavc: deprecate AVCodecContext.inter_threshold.
It's unused.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 8 | ||||
| -rw-r--r-- | libavcodec/options.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d8c7416be9..a9fc31e900 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1750,12 +1750,12 @@ typedef struct AVCodecContext { */ int noise_reduction; +#if FF_API_INTER_THRESHOLD /** - * - * - encoding: Set by user. - * - decoding: unused + * @deprecated this field is unused */ - int inter_threshold; + attribute_deprecated int inter_threshold; +#endif /** * quantizer noise shaping diff --git a/libavcodec/options.c b/libavcodec/options.c index bfd4b8988f..dbf3427d91 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -320,7 +320,9 @@ static const AVOption options[]={ {"lmax", "max lagrange factor (VBR)", OFFSET(lmax), AV_OPT_TYPE_INT, {.dbl = 31*FF_QP2LAMBDA }, 0, INT_MAX, V|E}, {"nr", "noise reduction", OFFSET(noise_reduction), AV_OPT_TYPE_INT, {.dbl = 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, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#if FF_API_INTER_THRESHOLD {"inter_threshold", NULL, OFFSET(inter_threshold), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, +#endif {"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.dbl = DEFAULT}, 0, UINT_MAX, V|A|E|D, "flags2"}, {"error", NULL, OFFSET(error_rate), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"qns", "quantizer noise shaping", OFFSET(quantizer_noise_shaping), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, diff --git a/libavcodec/version.h b/libavcodec/version.h index 618e92b3e2..2f11a29d92 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -56,5 +56,8 @@ #ifndef FF_API_COLOR_TABLE_ID #define FF_API_COLOR_TABLE_ID (LIBAVCODEC_VERSION_MAJOR < 55) #endif +#ifndef FF_API_INTER_THRESHOLD +#define FF_API_INTER_THRESHOLD (LIBAVCODEC_VERSION_MAJOR < 55) +#endif #endif /* AVCODEC_VERSION_H */ |