diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 11:29:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 11:29:04 +0100 |
| commit | 5753e3490696bb65dc8a865a5256933f370753aa (patch) | |
| tree | 6d822a496a3fe6ef32788dae5a1af8b0d946d226 | |
| parent | a8c077732598dffe6cf32fc5d6eb8adcffd5c1f7 (diff) | |
| parent | fcb07e8b332bbd6f9558bff98ff5102c5f2d8252 (diff) | |
| download | ffmpeg-5753e3490696bb65dc8a865a5256933f370753aa.tar.gz | |
Merge commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252'
* commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252':
lavc: remove disabled FF_API_MMI cruft
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 5837b8d8e0..1423bef50a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2509,9 +2509,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 befa448c40..42c0ad0ee9 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -189,9 +189,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 4825161e42..cf8f6b52d8 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -76,9 +76,6 @@ #ifndef FF_API_AVCODEC_RESAMPLE #define FF_API_AVCODEC_RESAMPLE (LIBAVCODEC_VERSION_MAJOR < 56) #endif -#ifndef FF_API_MMI -#define FF_API_MMI (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_IDCT #define FF_API_IDCT (LIBAVCODEC_VERSION_MAJOR < 55) #endif |