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 '84bf8817206126dab3c9abf6055b593389bcb241'

Browse Source 
* commit '84bf8817206126dab3c9abf6055b593389bcb241':
  configure: Split x86 SIMD architecture extensions into separate list

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-06 21:58:46 +01:00
commit 85d2b0987b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -1451,15 +1451,13 @@ ARCH_EXT_LIST_ARM='
vfpv3
'
ARCH_EXT_LIST_X86='
ARCH_EXT_LIST_X86_SIMD='
amd3dnow
amd3dnowext
avx
avx2
cpunop
fma3
fma4
i686
mmx
mmxext
sse
@ -1471,6 +1469,12 @@ ARCH_EXT_LIST_X86='
xop
'
ARCH_EXT_LIST_X86="
$ARCH_EXT_LIST_X86_SIMD
cpunop
i686
"
ARCH_EXT_LIST="
$ARCH_EXT_LIST_ARM
$ARCH_EXT_LIST_X86
@ -1838,7 +1842,7 @@ mmx_external_deps="yasm"
mmx_inline_deps="inline_asm"
mmx_suggest="mmx_external mmx_inline"
for ext in $(filter_out mmx $ARCH_EXT_LIST_X86); do
for ext in $(filter_out mmx $ARCH_EXT_LIST_X86_SIMD); do
eval dep=\$${ext}_deps
eval ${ext}_external_deps='"${dep}_external"'
eval ${ext}_inline_deps='"${dep}_inline"'