diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 02:36:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 02:36:36 +0200 |
| commit | a6657044021527c8d8e5341199bded0e1b7eaec0 (patch) | |
| tree | f4dac419d3b249da2cb446111b609f575b82a1e1 | |
| parent | 865b70bc5d1cf37ec6d6cb729a69dda2cca28bd5 (diff) | |
| parent | 4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4 (diff) | |
| download | ffmpeg-a6657044021527c8d8e5341199bded0e1b7eaec0.tar.gz | |
Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'
* 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>
| -rw-r--r-- | libavutil/cpu.c | 2 | ||||
| -rw-r--r-- | libavutil/cpu.h | 1 | ||||
| -rw-r--r-- | libavutil/x86/cpu.c | 5 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/cpu.c b/libavutil/cpu.c index deb2a873d5..1dc5abb2b8 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -269,7 +269,7 @@ static const struct { { AV_CPU_FLAG_3DNOW, "3dnow" }, { AV_CPU_FLAG_3DNOWEXT, "3dnowext" }, { AV_CPU_FLAG_CMOV, "cmov" }, - { AV_CPU_FLAG_AVX2, "avx2" }, + { AV_CPU_FLAG_AVX2, "avx2" }, #endif { 0 } }; diff --git a/libavutil/cpu.h b/libavutil/cpu.h index e9185f12f4..55c3ec9a06 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -52,7 +52,6 @@ // #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) diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c index 174515f68d..18049eaead 100644 --- a/libavutil/x86/cpu.c +++ b/libavutil/x86/cpu.c @@ -134,13 +134,14 @@ int ff_get_cpu_flags_x86(void) if ((eax & 0x6) == 0x6) rval |= AV_CPU_FLAG_AVX; } - if (HAVE_AVX2 && max_std_level >= 7) - { +#if HAVE_AVX2 + if (max_std_level >= 7) { cpuid(7, eax, ebx, ecx, edx); if (ebx&0x00000020) rval |= AV_CPU_FLAG_AVX2; /* TODO: BMI1/2 */ } +#endif /* HAVE_AVX2 */ #endif /* HAVE_AVX */ #endif /* HAVE_SSE */ } |