diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-23 22:52:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-23 22:52:58 +0100 |
| commit | bd8d73ea8bb726de2506a292e00200d486fe24ca (patch) | |
| tree | 7e1c2c1ef3c263000687862ff5c2cfa72d4c90ac | |
| parent | d9574069c14a80944ae489b8a08876d123baa428 (diff) | |
| parent | d59fcdaff36eb45307a29756c5dd1852034a3f3f (diff) | |
| download | ffmpeg-bd8d73ea8bb726de2506a292e00200d486fe24ca.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: add detection for Bit Manipulation Instruction sets
Conflicts:
libavutil/x86/cpu.c
See: 0bc3de19ffe296254f214dc7615e624d8e401bcb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/x86/cpu.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c index 1fd7eed483..356cd44f06 100644 --- a/libavutil/x86/cpu.c +++ b/libavutil/x86/cpu.c @@ -139,21 +139,20 @@ int ff_get_cpu_flags_x86(void) } #endif /* HAVE_AVX */ #endif /* HAVE_SSE */ + } if (max_std_level >= 7) { cpuid(7, eax, ebx, ecx, edx); #if HAVE_AVX2 - if (ebx&0x00000020) + if (ebx & 0x00000020) rval |= AV_CPU_FLAG_AVX2; #endif /* HAVE_AVX2 */ /* BMI1/2 don't need OS support */ - if (ebx&0x00000008) - { + if (ebx & 0x00000008) { rval |= AV_CPU_FLAG_BMI1; - if (ebx&0x00000100) + if (ebx & 0x00000100) rval |= AV_CPU_FLAG_BMI2; } } - } cpuid(0x80000000, max_ext_level, ebx, ecx, edx); |