The code fails to compile and is broken beyond repair.
---
Removed file content deleted from the diff to avoid patch spam.
Makefile|2 +-
arch.mak|2 -
configure |8 -
libavcodec/avcodec.h|2 +
libavcodec/dsputil.c|1 -
libavcodec/dsputil.h|3 +-
libavcodec/mips/Makefile|4 -
libavcodec/mips/dsputil_mmi.c | 162 -
libavcodec/mips/idct_mmi.c | 361 ---
libavcodec/mips/mmi.h | 179 ---
libavcodec/mips/mpegvideo_mmi.c | 87 --
libavcodec/mpegvideo.c |2 -
libavcodec/mpegvideo.h |1 -
libavcodec/options_table.h |3 +
libavcodec/version.h|3 +
15 files changed, 10 insertions(+), 810 deletions(-)
delete mode 100644 libavcodec/mips/Makefile
delete mode 100644 libavcodec/mips/dsputil_mmi.c
delete mode 100644 libavcodec/mips/idct_mmi.c
delete mode 100644 libavcodec/mips/mmi.h
delete mode 100644 libavcodec/mips/mpegvideo_mmi.c
diff --git a/Makefile b/Makefile
index 77d51eb..1cbf2aa 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,7 @@ config.h: .config
SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \
ARCH_HEADERS BUILT_HEADERS SKIPHEADERS\
ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS NEON-OBJS \
- MMI-OBJS ALTIVEC-OBJS VIS-OBJS\
+ ALTIVEC-OBJS VIS-OBJS \
MMX-OBJS YASM-OBJS\
OBJS HOSTOBJS TESTOBJS
diff --git a/arch.mak b/arch.mak
index 33018f3..748783d 100644
--- a/arch.mak
+++ b/arch.mak
@@ -3,8 +3,6 @@ OBJS-$(HAVE_ARMV6) += $(ARMV6-OBJS) $(ARMV6-OBJS-yes)
OBJS-$(HAVE_ARMVFP) += $(ARMVFP-OBJS) $(ARMVFP-OBJS-yes)
OBJS-$(HAVE_NEON)+= $(NEON-OBJS)$(NEON-OBJS-yes)
-OBJS-$(HAVE_MMI) += $(MMI-OBJS) $(MMI-OBJS-yes)
-
OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS) $(ALTIVEC-OBJS-yes)
OBJS-$(HAVE_VIS) += $(VIS-OBJS) $(VIS-OBJS-yes)
diff --git a/configure b/configure
index 17f38ec..5c32e04 100755
--- a/configure
+++ b/configure
@@ -259,7 +259,6 @@ Optimization options (experts only):
--disable-armv6 disable armv6 optimizations
--disable-armv6t2disable armv6t2 optimizations
--disable-armvfp disable ARM VFP optimizations
- --disable-mmidisable MMI optimizations
--disable-neon disable NEON optimizations
--disable-visdisable VIS optimizations
--disable-inline-asm disable use of inline assembler
@@ -1101,7 +1100,6 @@ ARCH_EXT_LIST="
armv6
armv6t2
armvfp
-mmi
neon
ppc4xx
vfpv3
@@ -1350,8 +1348,6 @@ armvfp_deps="arm"
neon_deps="arm"
vfpv3_deps="armvfp"
-mmi_deps="mips"
-
altivec_deps="ppc"
ppc4xx_deps="ppc"
@@ -3026,7 +3022,6 @@ EOF
elif enabled mips; then
check_inline_asm loongson '"dmult.g $1, $2, $3"'
-enabled mmi && check_inline_asm mmi '"lq $2, 0($2)"'
elif enabled ppc; then
@@ -3572,9 +3567,6 @@ if enabled arm; then
echo "ARM VFP enabled ${armvfp-no}"
echo "NEON enabled ${neon-no}"
fi
-if enabled mips; then
-echo "MMI enabled ${mmi-no}"
-fi
if enabled ppc; then
echo "AltiVec enabled ${altivec-no}"
echo "PPC 4xx optimizations ${ppc4xx-no}"
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 32a7dcb..51270e6 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2623,7 +2623,9 @@ typedef struct AVCodecContext {
#if FF_API_LIBMPEG2
#define FF_IDCT_LIBMPEG2MMX 4
#endif
+#if FF_API_MMI
#define FF_IDCT_MMI 5
+#endif
#define FF_IDCT_ARM 7
#define FF_IDCT_ALTIVEC 8
#define FF_IDCT_SH4 9
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index ec43bf1..aeade1e 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -2968,7 +2968,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);
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 3131e26..af9114e 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -598,7 +598,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 *a