Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavutil / x86 / cpu.c

diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c
index 93df737c280b01a4e360a6da8ac5cea023f3ff86..b53379bbd3dc35e7699105e85308ce62510c8cb7 100644 (file)
--- a/libavutil/x86/cpu.c
+++ b/libavutil/x86/cpu.c
@@ -83,6 +83,8 @@ int ff_get_cpu_flags_x86(void)
         cpuid(1, eax, ebx, ecx, std_caps);
         family = ((eax>>8)&0xf) + ((eax>>20)&0xff);
         model  = ((eax>>4)&0xf) + ((eax>>12)&0xf0);
+        if (std_caps & (1<<15))
+            rval |= AV_CPU_FLAG_CMOV;
         if (std_caps & (1<<23))
             rval |= AV_CPU_FLAG_MMX;
         if (std_caps & (1<<25))