[FFmpeg-devel] [PATCH]Fix compilation with nasm

[Carl Eugen Hoyos]

On Wednesday 23 July 2014 12:43:06 am Ronald S. Bultje wrote:
> Hi,
>
> On Tue, Jul 22, 2014 at 5:45 PM, Carl Eugen Hoyos <cehoyos at ag.or.at> wrote:
> > Hi!
> >
> > Attached patch fixes compilation with nasm (and passes fate) here,
> > sorry if it is complete nonsense.
>
> You probably want "movd m13, betad", not "movq m13, betaq".

I had tried "betaqd" first...

New patch attached, thank you, Carl Eugen
-------------- next part --------------
From f437354e0ce05183aeffd7bb2ce2e844b3bd31cc Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos at ag.or.at>
Date: Wed, 23 Jul 2014 00:51:29 +0200
Subject: [PATCH] avcodec/x86/hevc_deblock: Fix compilation with nasm.

---
 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 395b20e..b263dca 100644
--- a/libavcodec/x86/hevc_deblock.asm
+++ b/libavcodec/x86/hevc_deblock.asm
@@ -355,7 +355,7 @@ ALIGN 16
 %if %1 > 8
     shl             betaq, %1 - 8
 %endif
-    movd            m13, betaq
+    movd            m13, betad
     SPLATW          m13, m13, 0
     ;end beta calculations
 
@@ -619,7 +619,7 @@ ALIGN 16
     paddw           m15, m2; p1'
 
     ;beta calculations
-    movd            m10, betaq
+    movd            m10, betad
     SPLATW          m10, m10, 0
 
     movd            m13, r7d; 1dp0 + 1dp3
-- 
1.7.10.4