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 /libavcodec/avcodec.h | |
| parent | fcb07e8b332bbd6f9558bff98ff5102c5f2d8252 (diff) | |
| download | ffmpeg-streaming-3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00.zip ffmpeg-streaming-3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00.tar.gz | |
lavc: remove disabled FF_API_SNOW cruft
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fc85979..84db6ca 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 |
