diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:04:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:04:04 +0100 |
| commit | a19a10a53e4a2d83320da8d15e6266d98330b80d (patch) | |
| tree | e99040d578f116aa782e2e3ae57f3eb9140aae6e /libavutil/x86/cpu.c | |
| parent | efdca97cf10450599c1cace171abe897fadfa25d (diff) | |
| parent | 8637f4edeee1a6bd18bc90740fafadd3e1b412aa (diff) | |
| download | ffmpeg-a19a10a53e4a2d83320da8d15e6266d98330b80d.tar.gz | |
Merge commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa' into release/0.10
* commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa':
x86: Add CPU flag for the i686 cmov instruction
Conflicts:
doc/APIchanges
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 93df737c28..5782ff73cf 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)) |