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/dsputil.c | |
| 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/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index ec1f6dd1f3..56c1ce5ab6 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -3162,7 +3162,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) if (HAVE_VIS) ff_dsputil_init_vis (c, avctx); if (ARCH_ALPHA) ff_dsputil_init_alpha (c, avctx); if (ARCH_PPC) ff_dsputil_init_ppc (c, avctx); - if (HAVE_MMI) ff_dsputil_init_mmi (c, avctx); if (ARCH_SH4) ff_dsputil_init_sh4 (c, avctx); if (ARCH_BFIN) ff_dsputil_init_bfin (c, avctx); if (HAVE_MIPSFPU) ff_dsputil_init_mips (c, avctx); |