diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:25:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 15:25:11 +0200 |
| commit | 85fe70b64c3d0c46ba5a8c7b501283e3b97e24e4 (patch) | |
| tree | cc7fb01fe9ef1bf8df01163a03f22e9fcbda93bd /libavcodec/options_table.h | |
| parent | b4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2 (diff) | |
| parent | ca411fc1d34329cd17b28627f697e391ae52073f (diff) | |
Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'
* commit 'ca411fc1d34329cd17b28627f697e391ae52073f':
avcodec: Remove broken MMI optimizations
Conflicts:
arch.mak
configure
libavcodec/avcodec.h
libavcodec/mips/Makefile
libavcodec/mips/dsputil_mmi.c
libavcodec/mips/idct_mmi.c
libavcodec/mips/mmi.h
libavcodec/mips/mpegvideo_mmi.c
libavcodec/options_table.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/options_table.h')
| -rw-r--r-- | libavcodec/options_table.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index e4397d0173..c4a9ea17b3 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -27,6 +27,7 @@ #include "libavutil/opt.h" #include "avcodec.h" +#include "version.h" #include "config.h" #define OFFSET(x) offsetof(AVCodecContext,x) @@ -203,7 +204,9 @@ static const AVOption options[]={ {"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"}, {"libmpeg2mmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_LIBMPEG2MMX }, 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"}, |