[vlc-commits] [Git][videolan/vlc][master] mft: Add a prefix to local definitions of GUIDs

[Martin Storsjö (@mstorsjo)]

Martin Storsjö pushed to branch master at VideoLAN / VLC


Commits:
850e0bcf by Martin Storsjö at 2021-07-14T18:21:19+00:00
mft: Add a prefix to local definitions of GUIDs

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

In https://github.com/mingw-w64/mingw-w64/commit/7fb7c9f6e401e2bc4393e61a27a68ebccffa1195,
the MFVideoFormat_L8 mediatype GUID was added, conflicting with our
own definition with the same name.

- - - - -


1 changed file:

- modules/codec/mft.c


Changes:

=====================================
modules/codec/mft.c
=====================================
@@ -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 }
 };
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/850e0bcfa0a99ed500adee9567c083fe77506565

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/850e0bcfa0a99ed500adee9567c083fe77506565
You're receiving this email because of your account on code.videolan.org.