Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Oct 2013 00:36:20 +0000 (02:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Oct 2013 00:36:36 +0000 (02:36 +0200)
* commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4':
  libavutil: x86: Add AVX2 capable CPU detection.

Conflicts:
libavutil/cpu.c
libavutil/cpu.h
libavutil/x86/cpu.c

See: 865b70bc5d1cf37ec6d6cb729a69dda2cca28bd5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/cpu.c
libavutil/cpu.h
libavutil/x86/cpu.c

diff --cc libavutil/cpu.c
Simple merge
diff --cc libavutil/cpu.h
  #define AV_CPU_FLAG_AVX          0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used
  #define AV_CPU_FLAG_XOP          0x0400 ///< Bulldozer XOP functions
  #define AV_CPU_FLAG_FMA4         0x0800 ///< Bulldozer FMA4 functions
 -#define AV_CPU_FLAG_CMOV         0x1000 ///< i686 cmov
 +// #if LIBAVUTIL_VERSION_MAJOR <52
 +#define AV_CPU_FLAG_CMOV      0x1001000 ///< supports cmov instruction
 +// #else
 +// #define AV_CPU_FLAG_CMOV         0x1000 ///< supports cmov instruction
 +// #endif
  #define AV_CPU_FLAG_AVX2         0x8000 ///< AVX2 functions: requires OS support even if YMM registers aren't used
  
  #define AV_CPU_FLAG_ALTIVEC      0x0001 ///< standard
  
  #define AV_CPU_FLAG_ARMV5TE      (1 << 0)
Simple merge