[FFmpeg-devel] [PATCH] build: fix windows build issue introduced by 45bea45

[Zhao Zhili]

> On May 15, 2025, at 20:46, Nuo Mi <nuomi2021 at gmail.com> wrote:
> 
> We defined CR to 2 in libavcodec/vvc/dec.h, but the CR used by _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY winnt.h
> reorder the header will avoid the issue.

There are similar issues of using short uppercase variable names or macro, e.g.,

f0f596dbc6b45b544d2d2d4fb78c0a2bdc3e6eb1

And

b1240c983f96271990c4262978a08edc8eb4df1f

How about limit the scope or add prefix to the macro?

> ---
> tests/checkasm/vvc_sao.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/tests/checkasm/vvc_sao.c b/tests/checkasm/vvc_sao.c
> index 9e6507b2c3..4ad40684fa 100644
> --- a/tests/checkasm/vvc_sao.c
> +++ b/tests/checkasm/vvc_sao.c
> @@ -20,14 +20,13 @@
> 
> #include <string.h>
> 
> +#include "checkasm.h"
> #include "libavutil/intreadwrite.h"
> #include "libavutil/mem_internal.h"
> 
> #include "libavcodec/vvc/dsp.h"
> #include "libavcodec/vvc/ctu.h"
> 
> -#include "checkasm.h"
> -
> static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff };
> static const uint32_t sao_size[] = {8, 16, 32, 48, 64, 80, 96, 112, 128};
> 
> -- 
> 2.34.1
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".