cosmetics in cpu detection

git-svn-id: svn://svn.videolan.org/x264/trunk@661 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/configure b/configure
index bb7c895b9ea3f87e838cdafaec5e6008f83a26aa..8b833e3419a4351095bf9874af61bee69c79db8f 100755 (executable)
--- a/configure
+++ b/configure
@@ -220,12 +220,11 @@ fi
 if [ $ARCH = X86 -o $ARCH = X86_64 ] ; then
     if as_check ; then
         CFLAGS="$CFLAGS -DHAVE_MMX"
-    fi
-    if as_check "pabsw xmm0, xmm0" ; then
-        ASFLAGS="$ASFLAGS -DHAVE_SSE3"
-        CFLAGS="$CFLAGS -DHAVE_SSE3"
-    fi
-    if ! as_check ; then
+        if as_check "pabsw xmm0, xmm0" ; then
+            ASFLAGS="$ASFLAGS -DHAVE_SSE3"
+            CFLAGS="$CFLAGS -DHAVE_SSE3"
+        fi
+    else
         echo "No suitable assembler found.  x264 will be several times slower."
         echo "Please install 'yasm' to get MMX/SSE optimized code."
         AS=""

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 33d59f3f00f2941c3768f55847405c17b55c47ea..82c904bad5a02f0e91ceb97626274ac769fbb929 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -679,14 +679,15 @@ x264_t *x264_encoder_open   ( x264_param_t *param )
 
     mbcmp_init( h );
 
-    x264_log( h, X264_LOG_INFO, "using cpu capabilities %s%s%s%s%s%s\n",
+    x264_log( h, X264_LOG_INFO, "using cpu capabilities: %s%s%s%s%s%s%s%s\n",
              param->cpu&X264_CPU_MMX ? "MMX " : "",
              param->cpu&X264_CPU_MMXEXT ? "MMXEXT " : "",
              param->cpu&X264_CPU_SSE ? "SSE " : "",
              param->cpu&X264_CPU_SSE2 ? "SSE2 " : "",
              param->cpu&X264_CPU_SSSE3 ? "SSSE3 " : "",
              param->cpu&X264_CPU_3DNOW ? "3DNow! " : "",
-             param->cpu&X264_CPU_ALTIVEC ? "Altivec " : "" );
+             param->cpu&X264_CPU_ALTIVEC ? "Altivec " : "",
+             param->cpu ? "" : "none!" );
 
     h->out.i_nal = 0;
     h->out.i_bitstream = X264_MAX( 1000000, h->param.i_width * h->param.i_height * 4