From: Ronald S. Bultje <rsbultje@gmail.com>
Date: Wed, 29 Dec 2010 18:04:57 +0000 (+0000)
Subject: Move PRED4x4_LOWPASS up so it can be used in 8x8l predict functions while
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=54a959e4837520a00634248c07ab373bf2f9776e;p=ffmpeg

Move PRED4x4_LOWPASS up so it can be used in 8x8l predict functions while
keeping the functions ordered in the source file (i.e. cosmetics).

Originally committed as revision 26136 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm
index 12193defc7f..832b8cdcaed 100644
--- a/libavcodec/x86/h264_intrapred.asm
+++ b/libavcodec/x86/h264_intrapred.asm
@@ -1066,6 +1066,18 @@ cglobal pred8x8_tm_vp8_ssse3, 2,3,6
     jg .loop
     REP_RET
 
+; dest, left, right, src, tmp
+; output: %1 = (t[n-1] + t[n]*2 + t[n+1] + 2) >> 2
+%macro PRED4x4_LOWPASS 5
+    mova    %5, %2
+    pavgb   %2, %3
+    pxor    %3, %5
+    mova    %1, %4
+    pand    %3, [pb_1]
+    psubusb %2, %3
+    pavgb   %1, %2
+%endmacro
+
 ;-----------------------------------------------------------------------------
 ; void pred4x4_dc_mmxext(uint8_t *src, const uint8_t *topright, int stride)
 ;-----------------------------------------------------------------------------
@@ -1173,18 +1185,6 @@ cglobal pred4x4_tm_vp8_ssse3, 3,3
     movd [r1+r2*2], mm5
     RET
 
-; dest, left, right, src, tmp
-; output: %1 = (t[n-1] + t[n]*2 + t[n+1] + 2) >> 2
-%macro PRED4x4_LOWPASS 5
-    mova    %5, %2
-    pavgb   %2, %3
-    pxor    %3, %5
-    mova    %1, %4
-    pand    %3, [pb_1]
-    psubusb %2, %3
-    pavgb   %1, %2
-%endmacro
-
 ;-----------------------------------------------------------------------------
 ; void pred4x4_vertical_vp8_mmxext(uint8_t *src, const uint8_t *topright, int stride)
 ;-----------------------------------------------------------------------------