Merge commit '1b932eb1508f550fac9e911923a0383efda53aa3'

* commit '1b932eb1508f550fac9e911923a0383efda53aa3':
  x86: add detection for FMA3 instruction set

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

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

libavutil/x86/cpu.c

@@ -133,7 +133,7 @@ int ff_get_cpu_flags_x86(void)
             xgetbv(0, eax, edx);
             if ((eax & 0x6) == 0x6) {
                 rval |= AV_CPU_FLAG_AVX;
-                if (ecx&0x00001000)
+                if (ecx & 0x00001000)
                     rval |= AV_CPU_FLAG_FMA3;
             }
         }