[FFmpeg-devel] [PATCH v2] {avcodec, tests}: rename the bundled Mesa AV1 vulkan video headers

[Jan Ekström]

On Sun, Feb 18, 2024 at 2:16 PM Jan Ekström <jeebjp at gmail.com> wrote:
>
> On Thu, Feb 15, 2024 at 9:21 PM Lynne <dev at lynne.ee> wrote:
> >
> > Feb 15, 2024, 20:18 by jeebjp at gmail.com:
> >
> > > This together with adjusting the inclusion define allows for the
> > > build to not fail with latest Vulkan-Headers that contain the
> > > stabilized Vulkan AV1 decoding definitions.
> > >
> > > Compilation fails currently as the AV1 header is getting included
> > > via hwcontext_vulkan.h -> <vulkan/vulkan.h> -> vulkan_core.h, which
> > > finally includes vk_video/vulkan_video_codec_av1std.h and the decode
> > > header, leading to the bundled header to never defining anything
> > > due to the inclusion define being the same.
> > >
> > > This fix is imperfect, as it leads to additional re-definition
> > > warnings for things such as
> > > VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION. , but it is
> > > not clear how to otherwise have the bundled version trump the
> > > actually standardized one for a short-term compilation fix.
> > > ---
> > >
> >
> > LGTM
>
> Thanks, applied to master as e06ce6d2b45edac4a2df04f304e18d4727417d24
> , as this takes care of the current build failure with latest vulkan
> headers.
>
> If there are no objections or issues to this way of handling the
> issue, I will later cherry-pick this to release/6.1 , which also
> contains these files.

As there were no objections, back-ported this fixup to release/6.1 as
fef22c87ada4517441701e6e61e062c9f4399c8e.

Jan