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 | |
| 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>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavutil/cpu.c | 1 | ||||
| -rw-r--r-- | libavutil/cpu.h | 1 | ||||
| -rw-r--r-- | libavutil/x86/cpu.c | 2 |
4 files changed, 7 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index f69941c39f..6484a2a46a 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2011-04-18 API changes, most recent first: +2014-09-16 - xxxxxxx - lavu 51.22.3 - cpu.h + Add AV_CPU_FLAG_CMOV. + 2012-01-24 - xxxxxxx - lavfi 2.60.100 Add avfilter_graph_dump. diff --git a/libavutil/cpu.c b/libavutil/cpu.c index fa64a83cfa..3d65bca3d1 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -69,6 +69,7 @@ static const struct { { AV_CPU_FLAG_FMA4, "fma4" }, { AV_CPU_FLAG_3DNOW, "3dnow" }, { AV_CPU_FLAG_3DNOWEXT, "3dnowext" }, + { AV_CPU_FLAG_CMOV, "cmov" }, #endif { 0 } }; diff --git a/libavutil/cpu.h b/libavutil/cpu.h index 5f7eed2b60..ed5d8594e9 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -41,6 +41,7 @@ #define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions #define AV_CPU_FLAG_FMA4 0x0800 ///< Bulldozer FMA4 functions #define AV_CPU_FLAG_IWMMXT 0x0100 ///< XScale IWMMXT +#define AV_CPU_FLAG_CMOV 0x1000 ///< i686 cmov #define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard /** 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)) |