RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-10-09 14:00:33 +02:00
parent 56db86a0b2 9e3946aada
commit 4ce82e6fa9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -4018,8 +4018,8 @@ EOF
elf*) enabled debug && append YASMFLAGS $yasm_debug ;; elf*) enabled debug && append YASMFLAGS $yasm_debug ;;
esac esac
check_yasm "pextrd [eax], xmm0, 1" && enable yasm || check_yasm "movbe ecx, [5]" && enable yasm ||
die "yasm not found, use --disable-yasm for a crippled build" 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 "vextractf128 xmm0, ymm0, 0" || disable avx_external avresample
check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
check_yasm "CPU amdnop" && enable cpunop check_yasm "CPU amdnop" && enable cpunop