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

[Nuo Mi]

Thank you, Zhili and softworkz, for the review.
Applied.

The purpose of the CR macro is to improve readability.
Adding a VVC_ prefix would make the code unnecessarily long and reduce
clarity.
I don't have a strong opinion on this, if either of you still feel that
VVC_CB is better.
I'm happy to make the change.

On Fri, May 16, 2025 at 4:31 AM softworkz . <softworkz at hotmail.com> wrote:

>
>
> > -----Original Message-----
> > From: ffmpeg-devel <ffmpeg-devel-bounces at ffmpeg.org> On Behalf Of Nuo Mi
> > Sent: Donnerstag, 15. Mai 2025 14:46
> > To: ffmpeg-devel at ffmpeg.org
> > Cc: Nuo Mi <nuomi2021 at gmail.com>
> > Subject: [FFmpeg-devel] [PATCH] build: fix windows build issue
> introduced by
> > 45bea45
> >
> > 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.
> > ---
> >  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};
> >
> > --
>
> LGTM - at least as an immediate fix for the builds (Zhao's suggestion can
> still be considered afterwards, I think)
>