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/mips/Makefile | |
| parent | b4ca1b159f4b7f0c3d1e4b2deab686bda934f3a2 (diff) | |
| parent | ca411fc1d34329cd17b28627f697e391ae52073f (diff) | |
| download | ffmpeg-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/mips/Makefile')
| -rw-r--r-- | libavcodec/mips/Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/mips/Makefile b/libavcodec/mips/Makefile index 8f64f8292a..2f053c99c8 100644 --- a/libavcodec/mips/Makefile +++ b/libavcodec/mips/Makefile @@ -1,8 +1,3 @@ -MMI-OBJS += mips/dsputil_mmi.o \ - mips/idct_mmi.o \ - -MMI-OBJS-$(CONFIG_MPEGVIDEO) += mips/mpegvideo_mmi.o - MIPSFPU-OBJS-$(CONFIG_AMRNB_DECODER) += mips/acelp_filters_mips.o \ mips/celp_filters_mips.o \ mips/celp_math_mips.o \ |