[FFmpeg-cvslog] r12589 - in trunk: configure libavcodec/Makefile libavcodec/mpegvideo.c
diego
subversion
Tue Mar 25 22:30:16 CET 2008
Author: diego
Date: Tue Mar 25 22:30:16 2008
New Revision: 12589
Log:
Classify mlib as a configurable option, not as a hardware feature.
Modified:
trunk/configure
trunk/libavcodec/Makefile
trunk/libavcodec/mpegvideo.c
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Tue Mar 25 22:30:16 2008
@@ -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"
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile (original)
+++ trunk/libavcodec/Makefile Tue Mar 25 22:30:16 2008
@@ -410,7 +410,7 @@ ASM_OBJS-$(HAVE_ARMV6) +
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 \
Modified: trunk/libavcodec/mpegvideo.c
==============================================================================
--- trunk/libavcodec/mpegvideo.c (original)
+++ trunk/libavcodec/mpegvideo.c Tue Mar 25 22:30:16 2008
@@ -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);
More information about the ffmpeg-cvslog
mailing list