OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9898bd9
84bf881
)
Merge commit '84bf8817206126dab3c9abf6055b593389bcb241'
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 6 Mar 2014 20:58:46 +0000
(21:58 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 6 Mar 2014 20:58:46 +0000
(21:58 +0100)
* commit '
84bf8817206126dab3c9abf6055b593389bcb241
':
configure: Split x86 SIMD architecture extensions into separate list
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1
2
configure
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
configure
index
f8ad270
,
6572e4e
..
d19799c
---
1
/
configure
---
2
/
configure
+++ b/
configure
@@@
-1456,10
-1254,9
+1456,8
@@@
ARCH_EXT_LIST_X86_SIMD=
amd3dnowext
avx
avx2
- cpunop
- xop
fma3
fma4
- i686
mmx
mmxext
sse
@@@
-1468,9
-1265,14
+1466,15
@@@
sse4
sse42
ssse3
+ xop
'
+ ARCH_EXT_LIST_X86="
+ $ARCH_EXT_LIST_X86_SIMD
+ cpunop
+ i686
+ "
+
ARCH_EXT_LIST="
$ARCH_EXT_LIST_ARM
$ARCH_EXT_LIST_X86