[MPlayer-cvslog] r36278 - in trunk: configure mpcommon.c

[reimar]

Author: reimar
Date: Fri May 17 17:59:38 2013
New Revision: 36278

Log:
Rename HAVE_CMOV to HAVE_I686 for FFmpeg.

Keep the cmov name in configure since it is less
confusing, since cmov is what we test for and
also since for example VIA C3 sometimes is considered
i686 that does not implement the optional CMOV
instruction.

Modified:
   trunk/configure
   trunk/mpcommon.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Fri May 17 15:04:37 2013	(r36277)
+++ trunk/configure	Fri May 17 17:59:38 2013	(r36278)
@@ -3122,7 +3122,7 @@ if arm ; then
   echores "$_iwmmxt"
 fi
 
-cpuexts_all='ALTIVEC AVX MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV CMOV FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 NEON IWMMXT MMI VIS MVI'
+cpuexts_all='ALTIVEC AVX MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 NEON IWMMXT MMI VIS MVI'
 test "$_altivec"   = yes && cpuexts="ALTIVEC $cpuexts"
 test "$_mmx"       = yes && cpuexts="MMX $cpuexts"
 test "$_mmxext"    = yes && cpuexts="MMX2 $cpuexts"
@@ -3136,7 +3136,7 @@ test "$_ssse3"     = yes && cpuexts="SSS
 test "$_sse4_1"    = yes && cpuexts="SSE4 $cpuexts"
 test "$_sse4_2"    = yes && cpuexts="SSE42 $cpuexts"
 test "$_avx"       = yes && cpuexts="AVX $cpuexts"
-test "$_cmov"      = yes && cpuexts="CMOV $cpuexts"
+test "$_cmov"      = yes && cpuexts="I686 $cpuexts"
 test "$_fast_cmov" = yes && cpuexts="FAST_CMOV $cpuexts"
 test "$_fast_clz"  = yes && cpuexts="FAST_CLZ $cpuexts"
 test "$_armv5te"   = yes && cpuexts="ARMV5TE $cpuexts"

Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c	Fri May 17 15:04:37 2013	(r36277)
+++ trunk/mpcommon.c	Fri May 17 17:59:38 2013	(r36278)
@@ -106,7 +106,7 @@ if (HAVE_SSE42)
     mp_msg(MSGT_CPLAYER,MSGL_V," SSE4.2");
 if (HAVE_AVX)
     mp_msg(MSGT_CPLAYER,MSGL_V," AVX");
-if (HAVE_CMOV)
+if (HAVE_I686)
     mp_msg(MSGT_CPLAYER,MSGL_V," CMOV");
     mp_msg(MSGT_CPLAYER,MSGL_V,"\n");
 #endif /* CONFIG_RUNTIME_CPUDETECT */