aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Oliver <protogonoi@gmail.com>2014-03-22 15:59:12 +1100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-22 14:07:03 +0100
commitcd5cf395f65a11555637e5faf6d41e07dab6cd95 (patch)
treecb252f943ed3a3678843340826b7b8774ebf1895
parentf02832904dbce8e0473cdc9c7b09d92493b40a14 (diff)
downloadffmpeg-cd5cf395f65a11555637e5faf6d41e07dab6cd95.tar.gz
Additional icl inline asm fix.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/x86/motion_est.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/x86/motion_est.c b/libavcodec/x86/motion_est.c
index 78db925313..f1e782b23d 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)