summaryrefslogtreecommitdiff
path: root/libavutil/x86/x86util.asm
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-14 16:06:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-14 16:06:22 +0200
commite3e0e3d0c913a55fd616d3c431859564dc0e9b79 (patch)
tree07e6759f4bf1a3472bc7258e6cf1192cce4292fb /libavutil/x86/x86util.asm
parent9ac124c889a6b3a8472f3bdfda2c379cb4ddaefa (diff)
parentc6908d6b4b377a04a5d055ba874bdbcf06c80497 (diff)
Merge commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497'
* commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497': x86inc: FMA3/4 Support Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86/x86util.asm')
-rw-r--r--libavutil/x86/x86util.asm4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm
index 01f306831c..59e5df248e 100644
--- a/libavutil/x86/x86util.asm
+++ b/libavutil/x86/x86util.asm
@@ -668,7 +668,9 @@
; Wrapper for non-FMA version of fmaddps
%macro FMULADD_PS 5
- %ifidn %1, %4
+ %if cpuflag(fma3) || cpuflag(fma4)
+ fmaddps %1, %2, %3, %4
+ %elifidn %1, %4
mulps %5, %2, %3
addps %1, %4, %5
%else