diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 11:28:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 11:28:21 +0200 |
| commit | 1e678007800ad9bd7332ea4f2250f5bcfac369ad (patch) | |
| tree | 81c2c61816a793cff5e3586fc172983b0e791891 | |
| parent | 8378aae7293575cecad9cccb23226708e2303ccf (diff) | |
| parent | 80fefbed623491b92fe59ead99225f99c0d0ca08 (diff) | |
| download | ffmpeg-1e678007800ad9bd7332ea4f2250f5bcfac369ad.tar.gz | |
Merge commit '80fefbed623491b92fe59ead99225f99c0d0ca08'
* commit '80fefbed623491b92fe59ead99225f99c0d0ca08':
x86: cpu: Restore some explanatory comments removed in 7160bb7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/cpu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/cpu.h b/libavutil/cpu.h index e9e07317f6..50bdea7918 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -33,9 +33,11 @@ #define AV_CPU_FLAG_SSE 0x0008 ///< SSE functions #define AV_CPU_FLAG_SSE2 0x0010 ///< PIV SSE2 functions #define AV_CPU_FLAG_SSE2SLOW 0x40000000 ///< SSE2 supported, but usually not faster + ///< than regular MMX/SSE (e.g. Core1) #define AV_CPU_FLAG_3DNOWEXT 0x0020 ///< AMD 3DNowExt #define AV_CPU_FLAG_SSE3 0x0040 ///< Prescott SSE3 functions #define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster + ///< than regular MMX/SSE (e.g. Core1) #define AV_CPU_FLAG_SSSE3 0x0080 ///< Conroe SSSE3 functions #define AV_CPU_FLAG_ATOM 0x10000000 ///< Atom processor, some SSSE3 instructions are slower #define AV_CPU_FLAG_SSE4 0x0100 ///< Penryn SSE4.1 functions |