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:37 +0100 |
| commit | d6ed604cf4ca86ed345125b26eb5bdeea6d6bf68 (patch) | |
| tree | caa24eac15f4c0aa89fd037f936de6121dbfd278 /libavcodec | |
| parent | 3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00 (diff) | |
| download | ffmpeg-d6ed604cf4ca86ed345125b26eb5bdeea6d6bf68.tar.gz | |
lavc: remove disabled FF_API_IDCT cruft
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 8 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 15 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 84db6cae47..e48b114a45 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2379,14 +2379,6 @@ typedef struct AVCodecContext { #define FF_IDCT_FAAN 20 #define FF_IDCT_SIMPLENEON 22 #define FF_IDCT_SIMPLEALPHA 23 -#if FF_API_IDCT -#define FF_IDCT_H264 11 -#define FF_IDCT_VP3 12 -#define FF_IDCT_CAVS 15 -#define FF_IDCT_WMV2 19 -#define FF_IDCT_EA 21 -#define FF_IDCT_BINK 24 -#endif /** * bits per sample/pixel from the demuxer (needed for huffyuv). diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 5f4b4e4505..e1b124b31c 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -188,10 +188,6 @@ static const AVOption options[]={ {"simplearmv6", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV6 }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"simpleneon", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLENEON }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"simplealpha", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEALPHA }, INT_MIN, INT_MAX, V|E|D, "idct"}, -#if FF_API_IDCT -{"h264", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_H264 }, INT_MIN, INT_MAX, V|E|D, "idct"}, -{"vp3", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_VP3 }, INT_MIN, INT_MAX, V|E|D, "idct"}, -#endif {"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"xvidmmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVIDMMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"}, diff --git a/libavcodec/version.h b/libavcodec/version.h index eeb7ab6315..561c880474 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_IDCT -#define FF_API_IDCT (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_DEINTERLACE #define FF_API_DEINTERLACE (LIBAVCODEC_VERSION_MAJOR < 56) #endif |