[FFmpeg-devel] [PATCH] Tiny adjustments for NASM 3 (PR #21126)

["Kacper Michajłow via ffmpeg-devel" <ffmpeg-devel@ffmpeg.org>]

PR #21126 opened by Kacper Michajłow (kasper93)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21126
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21126.patch


From a498fd8bb76892f67be6200ed49a8104ba858295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
Date: Mon, 8 Dec 2025 04:23:04 +0100
Subject: [PATCH 1/2] avcodec/x86/h264_idct: fix version check for NASM 3 and
 newer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
---
 libavcodec/x86/h264_idct.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm
index 47e4116f42..6ae8202748 100644
--- a/libavcodec/x86/h264_idct.asm
+++ b/libavcodec/x86/h264_idct.asm
@@ -695,7 +695,7 @@ cglobal h264_luma_dc_dequant_idct, 3, 4, 7
     RET
 
 %ifdef __NASM_VER__
-%if __NASM_MAJOR__ >= 2 && __NASM_MINOR__ >= 4
+%if __NASM_MAJOR__ > 2 || (__NASM_MAJOR__ == 2 && __NASM_MINOR__ >= 4)
 %unmacro STORE_DIFFx2 8 ; remove macro from x86util.asm but yasm doesn't have this yet
 %endif
 %endif
-- 
2.49.1


From b2c0361d8399a63527b0742297e646de703581d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
Date: Mon, 8 Dec 2025 04:27:29 +0100
Subject: [PATCH 2/2] swscale/x86/yuv2yuvX: don't use deprecated hexadecimal
 prefix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: warning: $ prefix for hexadecimal is deprecated [-w+number-deprecated-hex]
Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
---
 libswscale/x86/yuv2yuvX.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libswscale/x86/yuv2yuvX.asm b/libswscale/x86/yuv2yuvX.asm
index 369c850674..7137be2e17 100644
--- a/libswscale/x86/yuv2yuvX.asm
+++ b/libswscale/x86/yuv2yuvX.asm
@@ -54,8 +54,8 @@ cglobal yuv2yuvX, 7, 7, 8, filter, filterSize, src, dest, dstW, dither, offset
     jz                   .offset
 
     ; offset != 0 path.
-    psrlq                m5, m3, $18
-    psllq                m3, m3, $28
+    psrlq                m5, m3, 0x18
+    psllq                m3, m3, 0x28
     por                  m3, m3, m5
 
 .offset:
@@ -94,7 +94,7 @@ cglobal yuv2yuvX, 7, 7, 8, filter, filterSize, src, dest, dstW, dither, offset
     paddw                m6, m6, m2
     paddw                m1, m1, m5
 %endif
-    add                  filterSizeq, $10
+    add                  filterSizeq, 0x10
     mov                  srcq, [filterSizeq]
     test                 srcq, srcq
     jnz                  .loop
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org