PR #20681 opened by Jamaika1 URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20681 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20681.patch
``` h264_idct.asm:764: warning: redefining multi-line macro `STORE_DIFFx2' [-w+pp-macro-redef-multi] ``` >From 4e4864cf12178c3dc9f21008c50cf8f2591d7c6e Mon Sep 17 00:00:00 2001 From: Jamaika1 <[email protected]> Date: Thu, 9 Oct 2025 07:37:39 +0000 Subject: [PATCH] Warming NASM 3.01rc7 redefining multi-line macro `STORE_DIFFx2' ``` h264_idct.asm:764: warning: redefining multi-line macro `STORE_DIFFx2' [-w+pp-macro-redef-multi] ``` --- 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 d9c3c9c862..fa441e0172 100644 --- a/libavcodec/x86/h264_idct.asm +++ b/libavcodec/x86/h264_idct.asm @@ -757,7 +757,7 @@ INIT_MMX cpuname RET %ifdef __NASM_VER__ -%if __NASM_MAJOR__ >= 2 && __NASM_MINOR__ >= 4 +%if __NASM_MAJOR__ >= 3 || (__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 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
