Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: add detection for Bit Manipulation Instruction sets

Conflicts:
	libavutil/x86/cpu.c

See: 0bc3de19ff
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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);