changeset 28281:234831aa5256

Treat mlib as a normal FFmpeg option, not a CPU extension.
author diego
date Thu, 15 Jan 2009 15:51:50 +0000
parents 180991eb1ab6
children 31849f6ac0c7
files configure
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Jan 15 15:41:29 2009 +0000
+++ b/configure	Thu Jan 15 15:51:50 2009 +0000
@@ -2611,7 +2611,7 @@
   echores "$_iwmmxt"
 fi
 
-_cpuexts_all='ALTIVEC MMX MMX2 3DNOW 3DNOWEX SSE SSE2 SSSE3 FAST_CMOV CMOV PLD ARMV5TE ARMV6 ARMV6T2 ARMVFP IWMMXT MLIB MMI VIS MVI'
+_cpuexts_all='ALTIVEC MMX MMX2 3DNOW 3DNOWEX SSE SSE2 SSSE3 FAST_CMOV CMOV PLD ARMV5TE ARMV6 ARMV6T2 ARMVFP IWMMXT MMI VIS MVI'
 test "$_altivec"   = yes && _cpuexts="ALTIVEC $_cpuexts"
 test "$_mmx"       = yes && _cpuexts="MMX $_cpuexts"
 test "$_mmxext"    = yes && _cpuexts="MMX2 $_cpuexts"
@@ -5532,6 +5532,7 @@
 echores "$_sunaudio"
 
 
+def_mlib='#define CONFIG_MLIB 0'
 if sunos; then
 echocheck "Sun mediaLib"
 if test "$_mlib" = auto ; then
@@ -5540,9 +5541,8 @@
 #include <mlib.h>
 int main(void) { mlib_VideoColorYUV2ABGR420(0,0,0,0,0,0,0,0,0); return 0; }
 EOF
-  cc_check -lmlib && _mlib=yes
-fi
-test "$_mlib" = yes && _cpuexts="MLIB $_cpuexts"
+  cc_check -lmlib && _mlib=yes && def_mlib='#define CONFIG_MLIB 1'
+fi
 echores "$_mlib"
 fi #if sunos
 
@@ -8574,6 +8574,7 @@
 $_def_dcbzl
 $def_fast_64bit
 $_def_fast_unaligned
+$def_mlib
 $_def_mkstemp
 $_def_pthreads
 $_def_threads