mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Classify mlib as a configurable option, not as a hardware feature.
Originally committed as revision 12589 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
5ce265a1de
commit
a815037409
4
configure
vendored
4
configure
vendored
@ -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"
|
||||
|
@ -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 \
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user