[FFmpeg-cvslog] Additional icl inline asm fix.

Matt Oliver git at videolan.org
Sat Mar 22 16:17:48 CET 2014


ffmpeg | branch: master | Matt Oliver <protogonoi at gmail.com> | Sat Mar 22 15:59:12 2014 +1100| [cd5cf395f65a11555637e5faf6d41e07dab6cd95] | committer: Michael Niedermayer

Additional icl inline asm fix.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd5cf395f65a11555637e5faf6d41e07dab6cd95
---

 libavcodec/x86/motion_est.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/x86/motion_est.c b/libavcodec/x86/motion_est.c
index 78db925..f1e782b 100644
--- a/libavcodec/x86/motion_est.c
+++ b/libavcodec/x86/motion_est.c
@@ -264,7 +264,7 @@ static inline void sad8_4_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
         "punpckhbw %%mm7, %%mm5         \n\t"
         "paddw %%mm4, %%mm2             \n\t"
         "paddw %%mm5, %%mm3             \n\t"
-        "movq 16+"MANGLE(round_tab)", %%mm5 \n\t"
+        "movq %5, %%mm5                 \n\t"
         "paddw %%mm2, %%mm0             \n\t"
         "paddw %%mm3, %%mm1             \n\t"
         "paddw %%mm5, %%mm0             \n\t"
@@ -288,8 +288,7 @@ static inline void sad8_4_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
         " js 1b                         \n\t"
         : "+a" (len)
         : "r" (blk1 - len), "r" (blk1 - len + stride), "r" (blk2 - len),
-          "r" ((x86_reg) stride)
-          NAMED_CONSTRAINTS_ADD(round_tab));
+          "r" ((x86_reg) stride), "m" (round_tab[2]));
 }
 
 static inline int sum_mmx(void)



More information about the ffmpeg-cvslog mailing list