lzf: update pointer p after realloc

[ffmpeg] / libavcodec / x86 / fpel_mmx.c

diff --git a/libavcodec/x86/fpel_mmx.c b/libavcodec/x86/fpel_mmx.c
index be64098e0bb8867a2b5bb6731781b66d7a4d0254..813bcc2b37c8977e0e5cae5f130d81dce0a875e2 100644 (file)
--- a/libavcodec/x86/fpel_mmx.c
+++ b/libavcodec/x86/fpel_mmx.c
@@ -25,11 +25,12 @@
 #include <stdint.h>
 
 #include "config.h"
-#include "dsputil_mmx.h"
+#include "fpel.h"
+#include "inline_asm.h"
 
 #if HAVE_MMX_INLINE
 
-// in case more speed is needed - unroling would certainly help
+// in case more speed is needed - unrolling would certainly help
 void ff_avg_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
                         ptrdiff_t line_size, int h)
 {
@@ -78,26 +79,26 @@ void ff_put_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
                         ptrdiff_t line_size, int h)
 {
     __asm__ volatile (
-        "lea   (%3, %3), %%"REG_a"      \n\t"
+        "lea   (%3, %3), %%"FF_REG_a"   \n\t"
         ".p2align     3                 \n\t"
         "1:                             \n\t"
         "movq  (%1    ), %%mm0          \n\t"
         "movq  (%1, %3), %%mm1          \n\t"
         "movq     %%mm0, (%2)           \n\t"
         "movq     %%mm1, (%2, %3)       \n\t"
-        "add  %%"REG_a", %1             \n\t"
-        "add  %%"REG_a", %2             \n\t"
+        "add %%"FF_REG_a", %1           \n\t"
+        "add %%"FF_REG_a", %2           \n\t"
         "movq  (%1    ), %%mm0          \n\t"
         "movq  (%1, %3), %%mm1          \n\t"
         "movq     %%mm0, (%2)           \n\t"
         "movq     %%mm1, (%2, %3)       \n\t"
-        "add  %%"REG_a", %1             \n\t"
-        "add  %%"REG_a", %2             \n\t"
+        "add %%"FF_REG_a", %1           \n\t"
+        "add %%"FF_REG_a", %2           \n\t"
         "subl        $4, %0             \n\t"
         "jnz         1b                 \n\t"
         : "+g"(h), "+r"(pixels),  "+r"(block)
         : "r"((x86_reg)line_size)
-        : "%"REG_a, "memory"
+        : "%"FF_REG_a, "memory"
         );
 }
 
@@ -105,7 +106,7 @@ void ff_put_pixels16_mmx(uint8_t *block, const uint8_t *pixels,
                          ptrdiff_t line_size, int h)
 {
     __asm__ volatile (
-        "lea   (%3, %3), %%"REG_a"      \n\t"
+        "lea   (%3, %3), %%"FF_REG_a"   \n\t"
         ".p2align     3                 \n\t"
         "1:                             \n\t"
         "movq  (%1    ), %%mm0          \n\t"
@@ -116,8 +117,8 @@ void ff_put_pixels16_mmx(uint8_t *block, const uint8_t *pixels,
         "movq     %%mm4, 8(%2)          \n\t"
         "movq     %%mm1,  (%2, %3)      \n\t"
         "movq     %%mm5, 8(%2, %3)      \n\t"
-        "add  %%"REG_a", %1             \n\t"
-        "add  %%"REG_a", %2             \n\t"
+        "add %%"FF_REG_a", %1           \n\t"
+        "add %%"FF_REG_a", %2           \n\t"
         "movq  (%1    ), %%mm0          \n\t"
         "movq 8(%1    ), %%mm4          \n\t"
         "movq  (%1, %3), %%mm1          \n\t"
@@ -126,13 +127,13 @@ void ff_put_pixels16_mmx(uint8_t *block, const uint8_t *pixels,
         "movq     %%mm4, 8(%2)          \n\t"
         "movq     %%mm1,  (%2, %3)      \n\t"
         "movq     %%mm5, 8(%2, %3)      \n\t"
-        "add  %%"REG_a", %1             \n\t"
-        "add  %%"REG_a", %2             \n\t"
+        "add %%"FF_REG_a", %1           \n\t"
+        "add %%"FF_REG_a", %2           \n\t"
         "subl        $4, %0             \n\t"
         "jnz         1b                 \n\t"
         : "+g"(h), "+r"(pixels),  "+r"(block)
         : "r"((x86_reg)line_size)
-        : "%"REG_a, "memory"
+        : "%"FF_REG_a, "memory"
         );
 }