diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-23 08:20:12 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-11 18:22:26 +0100 |
| commit | 3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00 (patch) | |
| tree | 54f502931c88b01be4a54fc318f7490893bc9e57 | |
| parent | fcb07e8b332bbd6f9558bff98ff5102c5f2d8252 (diff) | |
| download | ffmpeg-3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00.tar.gz | |
lavc: remove disabled FF_API_SNOW cruft
| -rw-r--r-- | libavcodec/avcodec.h | 10 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 16 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fc859792e2..84db6cae47 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -154,9 +154,6 @@ enum AVCodecID { AV_CODEC_ID_MSZH, AV_CODEC_ID_ZLIB, AV_CODEC_ID_QTRLE, -#if FF_API_SNOW - AV_CODEC_ID_SNOW, -#endif AV_CODEC_ID_TSCC, AV_CODEC_ID_ULTI, AV_CODEC_ID_QDRAW, @@ -510,9 +507,6 @@ enum Motion_Est_ID { ME_X1, ///< reserved for experiments ME_HEX, ///< hexagon based search ME_UMH, ///< uneven multi-hexagon search -#if FF_API_SNOW - ME_ITER, ///< iterative search -#endif ME_TESA, ///< transformed exhaustive search algorithm }; @@ -1395,10 +1389,6 @@ typedef struct AVCodecContext { #define FF_CMP_VSAD 8 #define FF_CMP_VSSE 9 #define FF_CMP_NSSE 10 -#if FF_API_SNOW -#define FF_CMP_W53 11 -#define FF_CMP_W97 12 -#endif #define FF_CMP_DCTMAX 13 #define FF_CMP_DCT264 14 #define FF_CMP_CHROMA 256 diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index c10d2cef58..5f4b4e4505 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -83,9 +83,6 @@ static const AVOption options[]={ {"x1", "X1 motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_X1 }, INT_MIN, INT_MAX, V|E, "me_method" }, {"hex", "hex motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_HEX }, INT_MIN, INT_MAX, V|E, "me_method" }, {"umh", "umh motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_UMH }, INT_MIN, INT_MAX, V|E, "me_method" }, -#if FF_API_SNOW -{"iter", "iter motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = ME_ITER }, INT_MIN, INT_MAX, V|E, "me_method" }, -#endif {"extradata_size", NULL, OFFSET(extradata_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, {"time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, INT_MIN, INT_MAX}, {"g", "set the group of picture (GOP) size", OFFSET(gop_size), AV_OPT_TYPE_INT, {.i64 = 12 }, INT_MIN, INT_MAX, V|E}, diff --git a/libavcodec/version.h b/libavcodec/version.h index 69b73d9e60..eeb7ab6315 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_SNOW -#define FF_API_SNOW (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_IDCT #define FF_API_IDCT (LIBAVCODEC_VERSION_MAJOR < 55) #endif |