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/mpegvideo.c | |
parent | b4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2 (diff) | |
parent | ca411fc1d34329cd17b28627f697e391ae52073f (diff) | |
download | ffmpeg-streaming-85fe70b64c3d0c46ba5a8c7b501283e3b97e24e4.zip ffmpeg-streaming-85fe70b64c3d0c46ba5a8c7b501283e3b97e24e4.tar.gz |
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/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 2fe2c91..a3881f9 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -189,8 +189,6 @@ av_cold int ff_dct_common_init(MpegEncContext *s) ff_MPV_common_init_x86(s); #elif ARCH_ALPHA ff_MPV_common_init_axp(s); -#elif HAVE_MMI - ff_MPV_common_init_mmi(s); #elif ARCH_ARM ff_MPV_common_init_arm(s); #elif HAVE_ALTIVEC |