[FFmpeg-cvslog] lavc: deprecate AVCodecContext.inter_threshold.

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Feb 27 19:58:41 2012 +0100| [16b7557b794c6cd47c5a256a246f8c930c01eef7] | committer: Anton Khirnov

lavc: deprecate AVCodecContext.inter_threshold.

It's unused.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16b7557b794c6cd47c5a256a246f8c930c01eef7
---

 libavcodec/avcodec.h |    8 ++++----
 libavcodec/options.c |    2 ++
 libavcodec/version.h |    3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d8c7416..a9fc31e 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 bfd4b89..dbf3427 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 618e92b..2f11a29 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 */