diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 02:36:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 02:36:36 +0200 |
| commit | a6657044021527c8d8e5341199bded0e1b7eaec0 (patch) | |
| tree | f4dac419d3b249da2cb446111b609f575b82a1e1 /libavutil/cpu.h | |
| parent | 865b70bc5d1cf37ec6d6cb729a69dda2cca28bd5 (diff) | |
| parent | 4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4 (diff) | |
| download | ffmpeg-a6657044021527c8d8e5341199bded0e1b7eaec0.tar.gz | |
Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'
* commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4':
libavutil: x86: Add AVX2 capable CPU detection.
Conflicts:
libavutil/cpu.c
libavutil/cpu.h
libavutil/x86/cpu.c
See: 865b70bc5d1cf37ec6d6cb729a69dda2cca28bd5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/cpu.h')
| -rw-r--r-- | libavutil/cpu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavutil/cpu.h b/libavutil/cpu.h index e9185f12f4..55c3ec9a06 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -52,7 +52,6 @@ // #endif #define AV_CPU_FLAG_AVX2 0x8000 ///< AVX2 functions: requires OS support even if YMM registers aren't used - #define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard #define AV_CPU_FLAG_ARMV5TE (1 << 0) |