videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

mft: Add a prefix to local definitions of GUIDs 

This fixes building with the very latest nightly version of mingw-w64.

In 7fb7c9f6e4,
the MFVideoFormat_L8 mediatype GUID was added, conflicting with our
own definition with the same name.
This commit is contained in:
Martin Storsjö 2021-07-12 09:12:41 +03:00 committed by Jean-Baptiste Kempf
parent 2828c95004
commit 850e0bcfa0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/codec/mft.c
View File

@ -189,7 +189,13 @@ static const pair_format_guid video_format_table[] =
};
// 8-bit luminance only
DEFINE_MEDIATYPE_GUID (MFVideoFormat_L8, 50);
// Older versions of mingw-w64 lack this GUID, but it was added in mingw-w64
// git on 2021-07-11 (during __MINGW64_VERSION_MAJOR 10). Use a local
// redefinition of this GUID with a custom prefix, to let the same code build
// with both older and newer versions of mingw-w64 (and earlier git snapshots
// with __MINGW64_VERSION_MAJOR == 10).
DEFINE_MEDIATYPE_GUID (vlc_MFVideoFormat_L8, 50);
/*
* Table to map MF Transform raw 3D3 output formats to native VLC FourCC
@ -198,7 +204,7 @@ static const pair_format_guid d3d_format_table[] = {
{ VLC_CODEC_RGB32, &MFVideoFormat_RGB32 },
{ VLC_CODEC_RGB24, &MFVideoFormat_RGB24 },
{ VLC_CODEC_RGBA, &MFVideoFormat_ARGB32 },
{ VLC_CODEC_GREY, &MFVideoFormat_L8 },
{ VLC_CODEC_GREY, &vlc_MFVideoFormat_L8 },
{ 0, NULL }
};