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:18 +0100 |
| commit | fcb07e8b332bbd6f9558bff98ff5102c5f2d8252 (patch) | |
| tree | c6432333582f3655c073aa5d3a0de44720cc0d65 /libavcodec | |
| parent | de27d2b92fa97deb2856d18e9f5f19586ce45a0f (diff) | |
lavc: remove disabled FF_API_MMI cruft
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 741bfeb461..fc859792e2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2377,9 +2377,6 @@ typedef struct AVCodecContext { #define FF_IDCT_INT 1 #define FF_IDCT_SIMPLE 2 #define FF_IDCT_SIMPLEMMX 3 -#if FF_API_MMI -#define FF_IDCT_MMI 5 -#endif #define FF_IDCT_ARM 7 #define FF_IDCT_ALTIVEC 8 #define FF_IDCT_SH4 9 diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 6090a81913..c10d2cef58 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -183,9 +183,6 @@ static const AVOption options[]={ {"int", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_INT }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"simple", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLE }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, -#if FF_API_MMI -{"mmi", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_MMI }, INT_MIN, INT_MAX, V|E|D, "idct"}, -#endif {"arm", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_ARM }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"altivec", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_ALTIVEC }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"sh4", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SH4 }, INT_MIN, INT_MAX, V|E|D, "idct"}, diff --git a/libavcodec/version.h b/libavcodec/version.h index 3ad7cd4552..69b73d9e60 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_MMI -#define FF_API_MMI (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_SNOW #define FF_API_SNOW (LIBAVCODEC_VERSION_MAJOR < 55) #endif |