Merge commit '206895708ea2b464755d340e44501daf9a07c310'

[ffmpeg] / libavutil / x86 / x86util.asm

diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm
index 8908444950cea55bcaa5cd0bdfdcee5936c1f5b7..01f306831ca2381640b64ab13f5d0d7f6b4d312c 100644 (file)
--- a/libavutil/x86/x86util.asm
+++ b/libavutil/x86/x86util.asm
@@ -665,3 +665,14 @@
     psrad        %1, 16
 %endif
 %endmacro
+
+; Wrapper for non-FMA version of fmaddps
+%macro FMULADD_PS 5
+    %ifidn %1, %4
+        mulps   %5, %2, %3
+        addps   %1, %4, %5
+    %else
+        mulps   %1, %2, %3
+        addps   %1, %4
+    %endif
+%endmacro