| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-09 12:00:33 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-09 12:17:56 (GMT) |
| commit | 4ce82e6fa94c96ec2db76ce3be200e58f0a577c3 (patch) | |
| tree | 6ec6dc1ee385bfdaf9c0eecc998d53c34ccb480d | |
| parent | 56db86a0b2bfc486910c236596cf9911ab0e9fd4 (diff) | |
| parent | 9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1 (diff) | |
| download | ffmpeg-4ce82e6fa94c96ec2db76ce3be200e58f0a577c3.zip ffmpeg-4ce82e6fa94c96ec2db76ce3be200e58f0a577c3.tar.gz ffmpeg-4ce82e6fa94c96ec2db76ce3be200e58f0a577c3.tar.bz2 | |
Merge commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1'
* commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1':
build: Require yasm 0.8.0 or higher
Conflicts:
configure
If someone wants to continue supporting older yasm/nasm versions, patches are of course welcome!
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4018,8 +4018,8 @@ EOF elf*) enabled debug && append YASMFLAGS $yasm_debug ;; esac - check_yasm "pextrd [eax], xmm0, 1" && enable yasm || - die "yasm not found, use --disable-yasm for a crippled build" + check_yasm "movbe ecx, [5]" && enable yasm || + die "yasm/nasm not found or too old. Use --disable-yasm for a crippled build." check_yasm "vextractf128 xmm0, ymm0, 0" || disable avx_external avresample check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external check_yasm "CPU amdnop" && enable cpunop |