From a8150374097de8187ebff49755cb7c08be40e340 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 25 Mar 2008 21:30:16 +0000
Subject: [PATCH] Classify mlib as a configurable option, not as a hardware
feature.
Originally committed as revision 12589 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
configure | 4 +---
libavcodec/Makefile | 2 +-
libavcodec/mpegvideo.c | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index eee87f7a083..b90984c825e 100755
--- a/configure
+++ b/configure
@@ -658,6 +658,7 @@ CONFIG_LIST="
libx264
libxvid
memalign_hack
+ mlib
mpegaudio_hp
network
nonfree
@@ -748,7 +749,6 @@ HAVE_LIST="
malloc_h
memalign
mkstemp
- mlib
pld
ppc64
round
@@ -1027,8 +1027,6 @@ for opt do
;;
--cpu=*) cpu="$optval"
;;
- --enable-mlib) enable mlib
- ;;
--disable-devices) disable $INDEV_LIST $OUTDEV_LIST
;;
--enable-debug=*) debuglevel="$optval"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index b7896563cba..89082d87dea 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -410,7 +410,7 @@ ASM_OBJS-$(HAVE_ARMV6) += armv4l/simple_idct_armv6.o \
OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \
sparc/simple_idct_vis.o \
-OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o \
+OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \
OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \
alpha/motion_est_alpha.o \
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 7f3b9077816..67f0e940c82 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -125,7 +125,7 @@ int ff_dct_common_init(MpegEncContext *s)
MPV_common_init_mmx(s);
#elif defined(ARCH_ALPHA)
MPV_common_init_axp(s);
-#elif defined(HAVE_MLIB)
+#elif defined(CONFIG_MLIB)
MPV_common_init_mlib(s);
#elif defined(HAVE_MMI)
MPV_common_init_mmi(s);
--
GitLab