From 05b0998f511ffa699407465d48c7d5805f746ad2 Mon Sep 17 00:00:00 2001 From: Daniel Kang Date: Sun, 27 Jan 2013 20:28:58 +0000 Subject: [PATCH] dsputil: Fix error by not using redzone and register name Signed-off-by: Derek Buitenhuis Signed-off-by: Luca Barbato --- libavcodec/x86/hpeldsp.asm | 6 +++--- libavcodec/x86/mpeg4qpel.asm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/x86/hpeldsp.asm b/libavcodec/x86/hpeldsp.asm index 8afd955bf0..85594c1395 100644 --- a/libavcodec/x86/hpeldsp.asm +++ b/libavcodec/x86/hpeldsp.asm @@ -312,8 +312,8 @@ PUT_NO_RND_PIXELS8_Y2_EXACT ; avg_pixels8(uint8_t *block, const uint8_t *pixels, int line_size, int h) %macro AVG_PIXELS8 0 cglobal avg_pixels8, 4,5 - movsxdifnidn r2, edx - lea r4, [r2+r2] + movsxdifnidn r2, r2d + lea r4, [r2*2] .loop: mova m0, [r0] mova m1, [r0+r2] @@ -343,7 +343,7 @@ AVG_PIXELS8 ; avg_pixels8_x2(uint8_t *block, const uint8_t *pixels, int line_size, int h) %macro AVG_PIXELS8_X2 0 cglobal avg_pixels8_x2, 4,5 - movsxdifnidn r2, edx + movsxdifnidn r2, r2d lea r4, [r2*2] .loop: mova m0, [r1] diff --git a/libavcodec/x86/mpeg4qpel.asm b/libavcodec/x86/mpeg4qpel.asm index a5525d22fd..6b5d20326d 100644 --- a/libavcodec/x86/mpeg4qpel.asm +++ b/libavcodec/x86/mpeg4qpel.asm @@ -168,7 +168,7 @@ INIT_MMX 3dnow PUT_NO_RND_PIXELS16_l2 %macro MPEG4_QPEL16_H_LOWPASS 1 -cglobal %1_mpeg4_qpel16_h_lowpass, 5, 5, 0, 8 +cglobal %1_mpeg4_qpel16_h_lowpass, 5, 5, 0, 16 movsxdifnidn r2, r2d movsxdifnidn r3, r3d pxor m7, m7 @@ -201,7 +201,7 @@ cglobal %1_mpeg4_qpel16_h_lowpass, 5, 5, 0, 8 paddw m6, [PW_ROUND] paddw m0, m6 psraw m0, 5 - mova [rsp-8], m0 + mova [rsp+8], m0 mova m0, [r1+5] mova m5, m0 mova m6, m0 @@ -225,7 +225,7 @@ cglobal %1_mpeg4_qpel16_h_lowpass, 5, 5, 0, 8 paddw m1, [PW_ROUND] paddw m3, m1 psraw m3, 5 - mova m1, [rsp-8] + mova m1, [rsp+8] packuswb m1, m3 OP_MOV [r0], m1, m4 mova m1, [r1+9]