[vlc-commits] [Git][videolan/vlc][master] directx_va: Fix building with latest mingw-w64 from git

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
c81cb6fb by Martin Storsjö at 2024-09-19T08:38:41+00:00
directx_va: Fix building with latest mingw-w64 from git

Since mingw-w64 20331109d1c90c19a510408ab119a76004bc41ea
(September 17th), mingw-w64 headers do provide these GUIDs.
(They come from Wine as upstream, from Wine commit
6dfb84f5cbdf30c1dc0775fd4dae821ee8705ad4 from September 10th.)

This change does break building with older mingw-w64 13 git
snapshots though.

- - - - -


1 changed file:

- modules/codec/avcodec/directx_va.c


Changes:

=====================================
modules/codec/avcodec/directx_va.c
=====================================
@@ -137,7 +137,7 @@ DEFINE_GUID(DXVA2_ModeVP9_VLD_Profile0,             0x463707f8, 0xa1d0, 0x4585,
 DEFINE_GUID(DXVA2_ModeVP9_VLD_10bit_Profile2,       0xa4c749ef, 0x6ecf, 0x48aa, 0x84, 0x48, 0x50, 0xa7, 0xa1, 0x16, 0x5f, 0xf7);
 #  endif // __MINGW64_VERSION_MAJOR < 8
 
-// the following GUIDs are never defined in mingw-w64
+#  if __MINGW64_VERSION_MAJOR < 13
 DEFINE_GUID(DXVA_ModeMPEG1_A,                       0x1b81be09, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
 DEFINE_GUID(DXVA_ModeMPEG2_A,                       0x1b81be0A, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
 DEFINE_GUID(DXVA_ModeMPEG2_B,                       0x1b81be0B, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
@@ -155,6 +155,7 @@ DEFINE_GUID(DXVA_ModeH263_E,                        0x1b81be07, 0xa0c7, 0x11d3,
 DEFINE_GUID(DXVA_ModeH263_F,                        0x1b81be08, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
 
 DEFINE_GUID(DXVA_ModeH264_VLD_WithFMOASO_NoFGT,     0xd5f04ff9, 0x3418, 0x45d8, 0x95, 0x61, 0x32, 0xa7, 0x6a, 0xae, 0x2d, 0xdd);
+#  endif
 
 #endif // __MINGW64_VERSION_MAJOR
 



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

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


VideoLAN code repository instance