---
configure | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index e3941f9dfd..69bbf25bf5 100755
--- a/configure
+++ b/configure
@@ -3258,7 +3258,7 @@ pkg_config_default=pkg-config
ranlib_default="ranlib"
strip_default="strip"
version_script='--version-script'
-yasmexe_default="yasm"
+yasmexe_default="nasm"
windres_default="windres"
nvcc_default="nvcc"
nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2"
@@ -5476,11 +5476,9 @@ EOF
enabled mmxext && check_inline_asm mmxext_inline '"pmaxub %mm0, %mm1"'
if ! disabled_any asm mmx yasm; then
- if check_cmd $yasmexe --version; then
- enabled x86_64 && yasm_extra="-m amd64"
- yasm_debug="-g dwarf2"
- elif check_cmd nasm -v; then
- yasmexe=nasm
+ check_yasm "vdivpd zmm0{k1}{z}, zmm1, zmm3" ||
+ die "nasm not found or too old, version 2.11 is now required. Use
--disable-yasm for a crippled build."
+
yasm_debug="-g -F dwarf"
if enabled x86_64; then
case "$objformat" in
@@ -5488,7 +5486,6 @@ EOF
win32) objformat=win64 ;;
esac
fi
- fi
YASMFLAGS="-f $objformat $yasm_extra"
enabled pic && append YASMFLAGS "-DPIC"
@@ -5497,12 +5494,6 @@ EOF
elf*) enabled debug && append YASMFLAGS $yasm_debug ;;
esac
- check_yasm "movbe ecx, [5]" && enable yasm ||
- die "yasm/nasm not found or too old. Use --disable-yasm for a
crippled build."
- check_yasm "vextracti128 xmm0, ymm0, 0" || disable avx2_external
- check_yasm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external
- check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
- check_yasm "CPU amdnop" || disable cpunop
fi
case "$cpu" in
--
2.13.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
