diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-06-19 22:55:26 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-09-16 01:39:13 -0700 |
| commit | 8637f4edeee1a6bd18bc90740fafadd3e1b412aa (patch) | |
| tree | fef2b6124c3ff5e233c5d2397191ee8830311762 /libavutil/x86/cpu.c | |
| parent | c6af9e944ebeb336f6520f59afaebb62392fb026 (diff) | |
| download | ffmpeg-8637f4edeee1a6bd18bc90740fafadd3e1b412aa.tar.gz | |
x86: Add CPU flag for the i686 cmov instruction
(cherry picked from commit 65345a5a30a0e866b6944c0e6184be3feca04335)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Conflicts:
libavutil/cpu.c
libavutil/cpu.h
Diffstat (limited to 'libavutil/x86/cpu.c')
| -rw-r--r-- | libavutil/x86/cpu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c index 2424fe4516..b87d3a3a92 100644 --- 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)) |