diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-02 13:34:12 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-03 08:43:11 +0200 |
| commit | 4e3945fd2875c497d25f49a3c35cd6cf6577259e (patch) | |
| tree | 7d60d30d8833c13f859474fc9f3b576a4940b116 | |
| parent | 4a49d2d59cce5d10b8ac40ca0185ccf1f8deb99c (diff) | |
lavc: deprecate AVCodecContext.antialias_algo
It's been unused since mp3float decoder was added.
| -rw-r--r-- | libavcodec/avcodec.h | 5 | ||||
| -rw-r--r-- | libavcodec/options.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index eb355b0b33..95a933dcfc 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 e1188cdeb5..ae8abb2674 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 a0e19754a7..b93e7534bb 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -80,5 +80,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 */ |