Merge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 22:27:13 +0000 (23:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 22:27:13 +0000 (23:27 +0100)
* commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0':
  configure: Move cpunop into ARCH_EXT_LIST_X86

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -1465,6 -1262,6 +1465,7 @@@ ARCH_EXT_LIST_X86=
      sse4
      sse42
      ssse3
++    xop
  '
  
  ARCH_EXT_LIST="
@@@ -1544,11 -1332,8 +1545,10 @@@ HAVE_LIST=
      attribute_packed
      cdio_paranoia_h
      cdio_paranoia_paranoia_h
 +    CL_cl_h
 +    clock_gettime
      closesocket
      CommandLineToArgvW
-     cpunop
      CryptGenRandom
      dcbzl
      dev_bktr_ioctl_bt848_h