Merge commit '755cd4197d53946208e042f095b930dca18d9430'

[ffmpeg] / libavutil / x86 / x86util.asm

diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm
index 7fc3044683b98fa6d292a80126676c702ce0b3b5..258626af21afe202419e445488e523a86eb6c2bf 100644 (file)
--- a/libavutil/x86/x86util.asm
+++ b/libavutil/x86/x86util.asm
@@ -42,10 +42,9 @@
 %endmacro
 
 %macro SBUTTERFLYPS 3
-    movaps   m%3, m%1
-    unpcklps m%1, m%2
-    unpckhps m%3, m%2
-    SWAP %2, %3
+    unpcklps m%3, m%1, m%2
+    unpckhps m%1, m%1, m%2
+    SWAP %1, %3, %2
 %endmacro
 
 %macro TRANSPOSE4x4B 5
@@ -585,3 +584,12 @@
     pminsd  %1, %3
     pmaxsd  %1, %2
 %endmacro
+
+%macro VBROADCASTSS 2 ; dst xmm/ymm, src m32
+%if cpuflag(avx)
+    vbroadcastss %1, %2
+%else ; sse
+    movss        %1, %2
+    shufps       %1, %1, 0
+%endif
+%endmacro