Originally committed as revision 12589 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -658,6 +658,7 @@ CONFIG_LIST=" | |||||
| libx264 | libx264 | ||||
| libxvid | libxvid | ||||
| memalign_hack | memalign_hack | ||||
| mlib | |||||
| mpegaudio_hp | mpegaudio_hp | ||||
| network | network | ||||
| nonfree | nonfree | ||||
| @@ -748,7 +749,6 @@ HAVE_LIST=" | |||||
| malloc_h | malloc_h | ||||
| memalign | memalign | ||||
| mkstemp | mkstemp | ||||
| mlib | |||||
| pld | pld | ||||
| ppc64 | ppc64 | ||||
| round | round | ||||
| @@ -1027,8 +1027,6 @@ for opt do | |||||
| ;; | ;; | ||||
| --cpu=*) cpu="$optval" | --cpu=*) cpu="$optval" | ||||
| ;; | ;; | ||||
| --enable-mlib) enable mlib | |||||
| ;; | |||||
| --disable-devices) disable $INDEV_LIST $OUTDEV_LIST | --disable-devices) disable $INDEV_LIST $OUTDEV_LIST | ||||
| ;; | ;; | ||||
| --enable-debug=*) debuglevel="$optval" | --enable-debug=*) debuglevel="$optval" | ||||
| @@ -410,7 +410,7 @@ ASM_OBJS-$(HAVE_ARMV6) += armv4l/simple_idct_armv6.o \ | |||||
| OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \ | OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \ | ||||
| sparc/simple_idct_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 \ | OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \ | ||||
| alpha/motion_est_alpha.o \ | alpha/motion_est_alpha.o \ | ||||
| @@ -125,7 +125,7 @@ int ff_dct_common_init(MpegEncContext *s) | |||||
| MPV_common_init_mmx(s); | MPV_common_init_mmx(s); | ||||
| #elif defined(ARCH_ALPHA) | #elif defined(ARCH_ALPHA) | ||||
| MPV_common_init_axp(s); | MPV_common_init_axp(s); | ||||
| #elif defined(HAVE_MLIB) | |||||
| #elif defined(CONFIG_MLIB) | |||||
| MPV_common_init_mlib(s); | MPV_common_init_mlib(s); | ||||
| #elif defined(HAVE_MMI) | #elif defined(HAVE_MMI) | ||||
| MPV_common_init_mmi(s); | MPV_common_init_mmi(s); | ||||