diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:23:28 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:23:28 +0200 |
| commit | f1b02e6ca88909f428d4a690c47620575853b647 (patch) | |
| tree | 2fa208c5ffa8b2dfd66cedda45489938bf36e8c0 | |
| parent | 58ebb39127da500ff1d54a059ecec0b344f113dd (diff) | |
| download | ffmpeg-f1b02e6ca88909f428d4a690c47620575853b647.tar.gz | |
lavu/cpu: remove old cmov cruft
| -rw-r--r-- | libavutil/cpu.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavutil/cpu.h b/libavutil/cpu.h index 471f7866f3..9403eca8d7 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -46,11 +46,7 @@ #define AV_CPU_FLAG_AVXSLOW 0x8000000 ///< AVX supported, but slow when using YMM registers (e.g. Bulldozer) #define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions #define AV_CPU_FLAG_FMA4 0x0800 ///< Bulldozer FMA4 functions -// #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_CMOV 0x1000 ///< supports cmov instruction #define AV_CPU_FLAG_AVX2 0x8000 ///< AVX2 functions: requires OS support even if YMM registers aren't used #define AV_CPU_FLAG_FMA3 0x10000 ///< Haswell FMA3 functions #define AV_CPU_FLAG_BMI1 0x20000 ///< Bit Manipulation Instruction Set 1 |