From 77cb44d759704704b68c2873220da162fd17bee8 Mon Sep 17 00:00:00 2001
From: kwkam <mailsende@gmail.com>
Date: Sat, 6 Feb 2016 15:18:40 +0800
Subject: video/decode/dxva2.c: GUID_NULL conflicts

GUID_NULL is defined in <ks.h>
gcc 6.0 refuses to link the executable because of that

Signed-off-by: wm4 <wm4@nowhere>
---
 video/decode/dxva2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/video/decode/dxva2.c b/video/decode/dxva2.c
index 0400b74bab..952727d8d4 100644
--- a/video/decode/dxva2.c
+++ b/video/decode/dxva2.c
@@ -27,6 +27,7 @@
 
 #include <d3d9.h>
 #include <dxva2api.h>
+#include <ks.h>
 
 #include <libavcodec/dxva2.h>
 
@@ -60,7 +61,6 @@ DEFINE_GUID(DXVA2_ModeVC1_D,          0x1b81beA3, 0xa0c7,0x11d3,0xb9,0x84,0x00,0
 DEFINE_GUID(DXVA2_ModeVC1_D2010,      0x1b81beA4, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
 DEFINE_GUID(DXVA2_ModeHEVC_VLD_Main,  0x5b11d51b, 0x2f4c,0x4452,0xbc,0xc3,0x09,0xf2,0xa1,0x16,0x0c,0xc0);
 DEFINE_GUID(DXVA2_NoEncrypt,          0x1b81beD0, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
-DEFINE_GUID(GUID_NULL,                0x00000000, 0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00);
 
 typedef IDirect3D9* WINAPI pDirect3DCreate9(UINT);
 typedef HRESULT WINAPI pCreateDeviceManager9(UINT *, IDirect3DDeviceManager9 **);
-- 
cgit v1.2.3