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.h | |
| 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/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index a1b88610c9..ad09a0cd43 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -610,7 +610,6 @@ static inline int get_penalty_factor(int lambda, int lambda2, int type){ void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_arm(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_bfin(DSPContext* c, AVCodecContext *avctx); -void ff_dsputil_init_mmi(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx); @@ -619,7 +618,7 @@ void ff_dsputil_init_mips(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_dwt(DSPContext *c); -#if (ARCH_ARM && HAVE_NEON) || ARCH_PPC || HAVE_MMI || HAVE_MMX +#if (ARCH_ARM && HAVE_NEON) || ARCH_PPC || HAVE_MMX # define STRIDE_ALIGN 16 #else # define STRIDE_ALIGN 8 |