aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/x86/cpu.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-23 22:42:43 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-23 22:43:08 +0100
commitd9574069c14a80944ae489b8a08876d123baa428 (patch)
tree5b534a22e9f6b9a39f503d1e4cc8670b24e8b20a /libavutil/x86/cpu.c
parent09824332534990be7d08c5cdcebdcd5926e0a739 (diff)
parent1b932eb1508f550fac9e911923a0383efda53aa3 (diff)
downloadffmpeg-d9574069c14a80944ae489b8a08876d123baa428.tar.gz
Merge commit '1b932eb1508f550fac9e911923a0383efda53aa3'
* commit '1b932eb1508f550fac9e911923a0383efda53aa3': x86: add detection for FMA3 instruction set Conflicts: configure libavutil/cpu.h libavutil/x86/cpu.c See: a2af8eddab75f1eac712411e4dde89823c0845e8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86/cpu.c')
-rw-r--r--libavutil/x86/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c
index e0b4c89062..1fd7eed483 100644
--- a/libavutil/x86/cpu.c
+++ b/libavutil/x86/cpu.c
@@ -133,7 +133,7 @@ int ff_get_cpu_flags_x86(void)
xgetbv(0, eax, edx);
if ((eax & 0x6) == 0x6) {
rval |= AV_CPU_FLAG_AVX;
- if (ecx&0x00001000)
+ if (ecx & 0x00001000)
rval |= AV_CPU_FLAG_FMA3;
}
}