virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavc: remove disabled FF_API_SNOW cruft

Browse Source
This commit is contained in:
Anton Khirnov
2013-02-23 08:20:12 +01:00
parent fcb07e8b33
commit 3bcdf8dcb9
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/avcodec.h
View File

@@ -154,9 +154,6 @@ enum AVCodecID {
AV_CODEC_ID_MSZH, AV_CODEC_ID_MSZH,
AV_CODEC_ID_ZLIB, AV_CODEC_ID_ZLIB,
AV_CODEC_ID_QTRLE, AV_CODEC_ID_QTRLE,
#if FF_API_SNOW
AV_CODEC_ID_SNOW,
#endif
AV_CODEC_ID_TSCC, AV_CODEC_ID_TSCC,
AV_CODEC_ID_ULTI, AV_CODEC_ID_ULTI,
AV_CODEC_ID_QDRAW, AV_CODEC_ID_QDRAW,
@@ -510,9 +507,6 @@ enum Motion_Est_ID {
ME_X1, ///< reserved for experiments ME_X1, ///< reserved for experiments
ME_HEX, ///< hexagon based search ME_HEX, ///< hexagon based search
ME_UMH, ///< uneven multi-hexagon search ME_UMH, ///< uneven multi-hexagon search
#if FF_API_SNOW
ME_ITER, ///< iterative search
#endif
ME_TESA, ///< transformed exhaustive search algorithm ME_TESA, ///< transformed exhaustive search algorithm
}; };
@@ -1395,10 +1389,6 @@ typedef struct AVCodecContext {
#define FF_CMP_VSAD 8 #define FF_CMP_VSAD 8
#define FF_CMP_VSSE 9 #define FF_CMP_VSSE 9
#define FF_CMP_NSSE 10 #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_DCTMAX 13
#define FF_CMP_DCT264 14 #define FF_CMP_DCT264 14
#define FF_CMP_CHROMA 256 #define FF_CMP_CHROMA 256

3
libavcodec/options_table.h
View File

@@ -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" }, {"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" }, {"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" }, {"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}, {"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}, {"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}, {"g", "set the group of picture (GOP) size", OFFSET(gop_size), AV_OPT_TYPE_INT, {.i64 = 12 }, INT_MIN, INT_MAX, V|E},

3
libavcodec/version.h
View File

@@ -49,9 +49,6 @@
#ifndef FF_API_REQUEST_CHANNELS #ifndef FF_API_REQUEST_CHANNELS
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56) #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56)
#endif #endif
#ifndef FF_API_SNOW
#define FF_API_SNOW (LIBAVCODEC_VERSION_MAJOR < 55)
#endif
#ifndef FF_API_IDCT #ifndef FF_API_IDCT
#define FF_API_IDCT (LIBAVCODEC_VERSION_MAJOR < 55) #define FF_API_IDCT (LIBAVCODEC_VERSION_MAJOR < 55)
#endif #endif