videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0' 

* commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0':
  configure: Move cpunop into ARCH_EXT_LIST_X86

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-20 23:27:13 +01:00
parent 36eec03211 2b0bb69997
commit 5176e9651b
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

@ -1454,7 +1454,7 @@ ARCH_EXT_LIST_X86='
amd3dnowext amd3dnowext
avx avx
avx2 avx2
xop cpunop
fma4 fma4
i686 i686
mmx mmx
@ -1465,6 +1465,7 @@ ARCH_EXT_LIST_X86='
sse4 sse4
sse42 sse42
ssse3 ssse3
xop
' '
ARCH_EXT_LIST=" ARCH_EXT_LIST="
@ -1548,7 +1549,6 @@ HAVE_LIST="
clock_gettime clock_gettime
closesocket closesocket
CommandLineToArgvW CommandLineToArgvW
cpunop
CryptGenRandom CryptGenRandom
dcbzl dcbzl
dev_bktr_ioctl_bt848_h dev_bktr_ioctl_bt848_h