aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-10-13 18:33:15 +0000
committerJames Almer <jamrial@gmail.com>2017-06-21 17:00:30 -0300
commit4f9297ac3b39098547863d28fbc8d2a906d5be49 (patch)
tree4672f09581a1a0e60b774e24f1f61457f5e69b0c /configure
parent3cc73d3d6d2a98cd0da3deda90760729c82cdeeb (diff)
downloadffmpeg-4f9297ac3b39098547863d28fbc8d2a906d5be49.tar.gz
build: Prefer NASM assembler over YASM
NASM is more actively maintained and permits generating dependency information as a sideeffect of assembling, thus cutting build times in half. (Cherry-picked from libav commit 57b753b445e23363c997a8ec1c556e0b0f6e9da3) Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index 73e973d220..d75aa7fe70 100755
--- a/configure
+++ b/configure
@@ -3258,7 +3258,7 @@ pkg_config_default=pkg-config
ranlib_default="ranlib"
strip_default="strip"
version_script='--version-script'
-x86asmexe_default="yasm"
+x86asmexe_default="nasm"
windres_default="windres"
nvcc_default="nvcc"
nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2"
@@ -5506,7 +5506,7 @@ EOF
}
if ! disabled_any asm mmx x86asm; then
- for program in $x86asmexe yasm nasm; do
+ for program in $x86asmexe nasm yasm; do
probe_x86asm $program
test -n "$x86asm_type" && break
done
@@ -5518,7 +5518,7 @@ EOF
esac
check_x86asm "movbe ecx, [5]" && enable x86asm ||
- die "yasm/nasm not found or too old. Use --disable-x86asm for a crippled build."
+ die "nasm/yasm not found or too old. Use --disable-x86asm for a crippled build."
check_x86asm "vextracti128 xmm0, ymm0, 0" || disable avx2_external
check_x86asm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external
check_x86asm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external