[vlc-devel] [PATCH] dxgi_fmt: don't force IID definitions

Steve Lhomme robux4 at videolabs.io
Tue Oct 24 14:01:24 CEST 2017


Let each module decide if they want it or not.
Also avoid multiple definitions in the same module.
---
 modules/video_chroma/d3d11_surface.c | 1 +
 modules/video_chroma/dxgi_fmt.c      | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/video_chroma/d3d11_surface.c b/modules/video_chroma/d3d11_surface.c
index d2b5ad15e4..37c2aa789b 100644
--- a/modules/video_chroma/d3d11_surface.c
+++ b/modules/video_chroma/d3d11_surface.c
@@ -39,6 +39,7 @@
 
 #include <windows.h>
 #define COBJMACROS
+#include <initguid.h>
 #include <d3d11.h>
 #include "d3d11_fmt.h"
 
diff --git a/modules/video_chroma/dxgi_fmt.c b/modules/video_chroma/dxgi_fmt.c
index 7e1b60cee0..9b9e9c9466 100644
--- a/modules/video_chroma/dxgi_fmt.c
+++ b/modules/video_chroma/dxgi_fmt.c
@@ -27,7 +27,6 @@
 #include <vlc_es.h>
 
 #define COBJMACROS
-#include <initguid.h>
 #include <d3d11.h>
 
 #include "dxgi_fmt.h"
-- 
2.14.2



More information about the vlc-devel mailing list