[libav-devel] [PATCH 2/2] lavc: deprecate AVCodecContext.antialias_algo

Anton Khirnov anton at khirnov.net
Sat Apr 2 16:37:02 CEST 2011


It's been unused since mp3float decoder was added.
---
 libavcodec/avcodec.h |    5 ++++-
 libavcodec/options.c |    2 ++
 libavcodec/version.h |    3 +++
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 98206d5..1f32592 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2153,16 +2153,19 @@ typedef struct AVCodecContext {
      */
     int error_rate;
 
+#if FF_API_ANTIALIAS_ALGO
     /**
      * MP3 antialias algorithm, see FF_AA_* below.
      * - encoding: unused
      * - decoding: Set by user.
      */
-    int antialias_algo;
+    attribute_deprecated int antialias_algo;
 #define FF_AA_AUTO    0
 #define FF_AA_FASTINT 1 //not implemented yet
 #define FF_AA_INT     2
 #define FF_AA_FLOAT   3
+#endif
+
     /**
      * quantizer noise shaping
      * - encoding: Set by user.
diff --git a/libavcodec/options.c b/libavcodec/options.c
index e1188cd..ae8abb2 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -319,7 +319,9 @@ static const AVOption options[]={
 {"inter_threshold", NULL, OFFSET(inter_threshold), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
 {"flags2", NULL, OFFSET(flags2), FF_OPT_TYPE_FLAGS, CODEC_FLAG2_FASTPSKIP|CODEC_FLAG2_BIT_RESERVOIR|CODEC_FLAG2_PSY|CODEC_FLAG2_MBTREE, 0, UINT_MAX, V|A|E|D, "flags2"},
 {"error", NULL, OFFSET(error_rate), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
+#if FF_API_ANTIALIAS_ALGO
 {"antialias", "MP3 antialias algorithm", OFFSET(antialias_algo), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|D, "aa"},
+#endif
 {"auto", NULL, 0, FF_OPT_TYPE_CONST, FF_AA_AUTO, INT_MIN, INT_MAX, V|D, "aa"},
 {"fastint", NULL, 0, FF_OPT_TYPE_CONST, FF_AA_FASTINT, INT_MIN, INT_MAX, V|D, "aa"},
 {"int", NULL, 0, FF_OPT_TYPE_CONST, FF_AA_INT, INT_MIN, INT_MAX, V|D, "aa"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index c682277..f5373e0 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -83,5 +83,8 @@
 #ifndef FF_API_MB_Q
 #define FF_API_MB_Q             (LIBAVCODEC_VERSION_MAJOR < 53)
 #endif
+#ifndef FF_API_ANTIALIAS_ALGO
+#define FF_API_ANTIALIAS_ALGO   (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
 
 #endif /* AVCODEC_VERSION_H */
-- 
1.7.4.1



More information about the libav-devel mailing list