compile x86 with fpmath=sse by default

diff --git a/configure b/configure
index ac07a01a670b6be63fe3a50bd3c7897b8380103e..767570a8e542c9197b7463bd7dc308732187657f 100755 (executable)
--- a/configure
+++ b/configure
@@ -239,6 +239,9 @@ case $host_cpu in
     if [[ "$asm" == yes && "$CFLAGS" != *-march* ]]; then
       CFLAGS="$CFLAGS -march=i686"
     fi
+    if [[ "$asm" == yes && "$CFLAGS" != *-mfpmath* ]]; then
+      CFLAGS="$CFLAGS -mfpmath=sse -msse"
+    fi
     if [ "$SYS" = MACOSX ]; then
       ASFLAGS="$ASFLAGS -f macho -DPREFIX"
     elif [ "$SYS" = MINGW ]; then

diff --git a/encoder/encoder.c b/encoder/encoder.c
index caefa669f5d38b0d3871fef15827e657d2c120ce..955b2ec1b250487f032c07452cb599f64dd1bd3f 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -338,9 +338,9 @@ fail:
 static int x264_validate_parameters( x264_t *h )
 {
 #ifdef HAVE_MMX
-    if( !(x264_cpu_detect() & X264_CPU_MMXEXT) )
+    if( !(x264_cpu_detect() & X264_CPU_SSE) )
     {
-        x264_log( h, X264_LOG_ERROR, "your cpu does not support MMXEXT, but x264 was compiled with asm support\n");
+        x264_log( h, X264_LOG_ERROR, "your cpu does not support SSE1, but x264 was compiled with asm support\n");
         x264_log( h, X264_LOG_ERROR, "to run x264, recompile without asm support (configure --disable-asm)\n");
         return -1;
     }