virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit '84146963d23d76b09af633e97413cd97d9b3021e'

Browse Source 
* commit '84146963d23d76b09af633e97413cd97d9b3021e':
  configure: x86: Fix handling of i686 and cpunop features

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-29 13:52:05 +02:00
commit 8f68ef4681
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -1337,6 +1337,7 @@ ARCH_EXT_LIST_X86='
amd3dnowext amd3dnowext
avx avx
fma4 fma4
i686
mmx mmx
mmxext mmxext
sse sse
@ -1461,7 +1462,6 @@ HAVE_LIST="
glob glob
gnu_as gnu_as
gsm_h gsm_h
i686
ibm_asm ibm_asm
inet_aton inet_aton
io_h io_h
@ -1679,7 +1679,9 @@ ppc4xx_deps="ppc"
vis_deps="sparc" vis_deps="sparc"
x86_64_suggest="fast_cmov i686" cpunop_deps="i686"
x86_64_select="i686"
x86_64_suggest="fast_cmov"
amd3dnow_deps="mmx" amd3dnow_deps="mmx"
amd3dnowext_deps="amd3dnow" amd3dnowext_deps="amd3dnow"
@ -3977,7 +3979,7 @@ EOF
die "yasm not found, use --disable-yasm for a crippled build" die "yasm not found, 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" && enabled i686 && enable cpunop check_yasm "CPU amdnop" && enable cpunop
fi fi
case "$cpu" in case "$cpu" in