[FFmpeg-cvslog] configure: disable cpunop if the check fails

Janne Grunau git at videolan.org
Sun Feb 23 22:30:31 CET 2014


ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Sun Feb 23 14:09:06 2014 +0100| [5800ba0db667630e6ff81d30f03961ea10726aa6] | committer: Janne Grunau

configure: disable cpunop if the check fails

Moving cpunop from the HAVE_LIST to the ARCH_EXT_LIST_X86 has the side
effect of enabling it. The semantics of the check have to be changed
from enable if successful to disable if unsuccessful. This was missing
in 2b0bb69997c2416e74f41aa1400ce983bf8775c0 causing build errors with
nasm.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5800ba0db667630e6ff81d30f03961ea10726aa6
---

 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 72cf831..f889005 100755
--- a/configure
+++ b/configure
@@ -3758,7 +3758,7 @@ EOF
         check_yasm "movbe ecx, [5]" && enable yasm ||
             die "yasm/nasm not found or too old. Use --disable-yasm for a crippled build."
         check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
-        check_yasm "CPU amdnop" && enable cpunop
+        check_yasm "CPU amdnop" || disable cpunop
     fi
 
     case "$cpu" in



More information about the ffmpeg-cvslog mailing list