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.c | |
| parent | 865b70bc5d1cf37ec6d6cb729a69dda2cca28bd5 (diff) | |
| parent | 4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4 (diff) | |
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.c')
| -rw-r--r-- | libavutil/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/cpu.c b/libavutil/cpu.c index deb2a873d5..1dc5abb2b8 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -269,7 +269,7 @@ static const struct { { AV_CPU_FLAG_3DNOW, "3dnow" }, { AV_CPU_FLAG_3DNOWEXT, "3dnowext" }, { AV_CPU_FLAG_CMOV, "cmov" }, - { AV_CPU_FLAG_AVX2, "avx2" }, + { AV_CPU_FLAG_AVX2, "avx2" }, #endif { 0 } }; |