hevc_deblock: Fix compilation with nasm

Message ID 1424627209-25730-1-git-send-email-vittorio.giovara@gmail.com
State Committed
Commit 2d1309c3528f89bfafe1298badf39fe7a1be0542
Headers show

Commit Message

Vittorio Giovara Feb. 22, 2015, 5:46 p.m.
From: Carl Eugen Hoyos <cehoyos@ag.or.at>

CC: libav-stable@libav.org
Bug-Id: 795
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
---
I don't have nasm, would be great if anyone could test.
Vittorio

 libavcodec/x86/hevc_deblock.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Luca Barbato Feb. 22, 2015, 5:52 p.m. | #1
On 22/02/15 18:46, Vittorio Giovara wrote:
> From: Carl Eugen Hoyos <cehoyos@ag.or.at>
>
> CC: libav-stable@libav.org
> Bug-Id: 795
> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
> ---
> I don't have nasm, would be great if anyone could test.
> Vittorio
>
>   libavcodec/x86/hevc_deblock.asm | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/x86/hevc_deblock.asm b/libavcodec/x86/hevc_deblock.asm
> index 45b8703..1e895f0 100644
> --- a/libavcodec/x86/hevc_deblock.asm
> +++ b/libavcodec/x86/hevc_deblock.asm
> @@ -356,7 +356,7 @@ ALIGN 16
>   %if %1 > 8
>       shl             betaq, %1 - 8
>   %endif
> -    movd            m13, betaq
> +    movd            m13, betad
>       SPLATW          m13, m13, 0
>       ;end beta calculations
>
> @@ -620,7 +620,7 @@ ALIGN 16
>       paddw           m15, m2; p1'
>
>       ;beta calculations
> -    movd            m10, betaq
> +    movd            m10, betad
>       SPLATW          m10, m10, 0
>
>       movd            m13, r7d; 1dp0 + 1dp3
>

Sure.

Patch

diff --git a/libavcodec/x86/hevc_deblock.asm b/libavcodec/x86/hevc_deblock.asm
index 45b8703..1e895f0 100644
--- a/libavcodec/x86/hevc_deblock.asm
+++ b/libavcodec/x86/hevc_deblock.asm
@@ -356,7 +356,7 @@  ALIGN 16
 %if %1 > 8
     shl             betaq, %1 - 8
 %endif
-    movd            m13, betaq
+    movd            m13, betad
     SPLATW          m13, m13, 0
     ;end beta calculations
 
@@ -620,7 +620,7 @@  ALIGN 16
     paddw           m15, m2; p1'
 
     ;beta calculations
-    movd            m10, betaq
+    movd            m10, betad
     SPLATW          m10, m10, 0
 
     movd            m13, r7d; 1dp0 + 1dp3