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/cpu.h | |
| 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/cpu.h')
| -rw-r--r-- | libavutil/cpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 /** |