Merge commit '8c02adc62d71dfbb079a04753d8c16152c49de88'

[ffmpeg] / libavutil / x86 / x86util.asm

diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm
index 807e87e60e178231506f71bd130fa5cbeaabecf9..1064e9a25cac9f1fce11b5175b4f4804de8ccb75 100644 (file)
--- a/libavutil/x86/x86util.asm
+++ b/libavutil/x86/x86util.asm
@@ -340,11 +340,19 @@
 %endif
 %endmacro
 
-%macro PAVGB 2
+%macro PAVGB 2-4
 %if cpuflag(mmxext)
     pavgb   %1, %2
 %elif cpuflag(3dnow)
     pavgusb %1, %2
+%elif cpuflag(mmx)
+    movu   %3, %2
+    por    %3, %1
+    pxor   %1, %2
+    pand   %1, %4
+    psrlq  %1, 1
+    psubb  %3, %1
+    SWAP   %1, %3
 %endif
 %endmacro