[vlc-commits] dxva: don't define GUIDs already found in dxva2api.h

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Aug 10 07:29:47 2020 +0200| [e3a1713e979d8b772f37e301c5d155f62e34c295] | committer: Steve Lhomme

dxva: don't define GUIDs already found in dxva2api.h

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e3a1713e979d8b772f37e301c5d155f62e34c295
---

 modules/codec/avcodec/directx_va.c     | 5 +----
 modules/codec/avcodec/dxva_blocklist.c | 5 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/codec/avcodec/directx_va.c b/modules/codec/avcodec/directx_va.c
index af7a478e24..8272bac952 100644
--- a/modules/codec/avcodec/directx_va.c
+++ b/modules/codec/avcodec/directx_va.c
@@ -75,9 +75,9 @@ static const int PROF_VP9_10[]      = { FF_PROFILE_VP9_2, FF_PROFILE_UNKNOWN };
 #define WINAPI_FAMILY WINAPI_PARTITION_DESKTOP
 
 #include <d3d9.h>
-#include <dxva2api.h>
 
 #include <initguid.h> /* must be last included to not redefine existing GUIDs */
+#include <dxva2api.h>
 #include <dxva.h>
 
 /* Codec capabilities GUID, sorted by codec */
@@ -86,8 +86,6 @@ DEFINE_GUID(DXVA_ModeMPEG2_A,                       0x1b81be0A, 0xa0c7, 0x11d3,
 DEFINE_GUID(DXVA_ModeMPEG2_B,                       0x1b81be0B, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
 DEFINE_GUID(DXVA_ModeMPEG2_C,                       0x1b81be0C, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
 DEFINE_GUID(DXVA_ModeMPEG2_D,                       0x1b81be0D, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-DEFINE_GUID(DXVA2_ModeMPEG2and1_VLD,                0x86695f12, 0x340e, 0x4f04, 0x9f, 0xd3, 0x92, 0x53, 0xdd, 0x32, 0x74, 0x60);
-DEFINE_GUID(DXVA2_ModeMPEG1_VLD,                    0x6f3ec719, 0x3735, 0x42cc, 0x80, 0x63, 0x65, 0xcc, 0x3c, 0xb3, 0x66, 0x16);
 
 DEFINE_GUID(DXVA_ModeH264_VLD_Multiview,            0x9901CCD3, 0xca12, 0x4b7e, 0x86, 0x7a, 0xe2, 0x22, 0x3d, 0x92, 0x55, 0xc3); // MVC
 DEFINE_GUID(DXVA_ModeH264_VLD_WithFMOASO_NoFGT,     0xd5f04ff9, 0x3418, 0x45d8, 0x95, 0x61, 0x32, 0xa7, 0x6a, 0xae, 0x2d, 0xdd);
@@ -96,7 +94,6 @@ DEFINE_GUID(DXVADDI_Intel_ModeH264_C,               0x604F8E66, 0x4951, 0x4c54,
 DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo,       0x604F8E68, 0x4951, 0x4c54, 0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6);
 DEFINE_GUID(DXVA_ModeH264_VLD_NoFGT_Flash,          0x4245F676, 0x2BBC, 0x4166, 0xa0, 0xBB, 0x54, 0xE7, 0xB8, 0x49, 0xC3, 0x80);
 
-DEFINE_GUID(DXVA2_ModeVC1_D2010,                    0x1b81beA4, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); // August 2010 update
 DEFINE_GUID(DXVA_Intel_VC1_ClearVideo,              0xBCC5DB6D, 0xA2B6, 0x4AF0, 0xAC, 0xE4, 0xAD, 0xB1, 0xF7, 0x87, 0xBC, 0x89);
 DEFINE_GUID(DXVA_Intel_VC1_ClearVideo_2,            0xE07EC519, 0xE651, 0x4CD6, 0xAC, 0x84, 0x13, 0x70, 0xCC, 0xEE, 0xC8, 0x51);
 
diff --git a/modules/codec/avcodec/dxva_blocklist.c b/modules/codec/avcodec/dxva_blocklist.c
index ef86d1479f..d6581d27d9 100644
--- a/modules/codec/avcodec/dxva_blocklist.c
+++ b/modules/codec/avcodec/dxva_blocklist.c
@@ -31,15 +31,16 @@
 
 #include "directx_va.h"
 
+#include <d3d9.h>
+#include <dxva2api.h>
+
 extern const GUID DXVA2_ModeMPEG2_VLD;
-extern const GUID DXVA2_ModeMPEG2and1_VLD;
 extern const GUID DXVA2_ModeH264_E;
 extern const GUID DXVA2_ModeH264_F;
 extern const GUID DXVA_Intel_H264_NoFGT_ClearVideo;
 extern const GUID DXVA_ModeH264_VLD_WithFMOASO_NoFGT;
 extern const GUID DXVA_ModeH264_VLD_NoFGT_Flash;
 extern const GUID DXVA2_ModeVC1_D;
-extern const GUID DXVA2_ModeVC1_D2010;
 extern const GUID DXVA_ModeHEVC_VLD_Main10;
 extern const GUID DXVA_ModeHEVC_VLD_Main;
 extern const GUID DXVA_ModeVP9_VLD_Profile0;