vlc | branch: master | Steve Lhomme <[email protected]> | Tue Apr 11 15:01:14 2017 +0200| [4c3b108b35d57df0e1c0758018171ff014372fa4] | committer: Jean-Baptiste Kempf
contrib: d3d9: restrict dxva2api to desktop apps It's not available with Windows Store apps Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4c3b108b35d57df0e1c0758018171ff014372fa4 --- contrib/src/d3d9/dxva2api.patch | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/contrib/src/d3d9/dxva2api.patch b/contrib/src/d3d9/dxva2api.patch index 951ffb83ae..18e36643f4 100644 --- a/contrib/src/d3d9/dxva2api.patch +++ b/contrib/src/d3d9/dxva2api.patch @@ -1,8 +1,20 @@ --- ../tarballs/dxva2api.idl 2017-04-11 14:13:48.105355400 +0200 -+++ dxva2api/dxva2api.idl 2017-04-11 14:59:17.092294600 +0200 -@@ -15,11 +15,12 @@ ++++ dxva2api/dxva2api.idl 2017-04-11 15:00:53.705524600 +0200 +@@ -6,6 +6,8 @@ + + import "unknwn.idl"; + ++cpp_quote("#include <winapifamily.h>") ++ + /* Fake widl types */ + cpp_quote("#if 0") + typedef DWORD IDirect3DDevice9; +@@ -14,12 +16,15 @@ + typedef DWORD D3DPOOL; cpp_quote("#endif") ++cpp_quote("#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)") ++ interface IDirectXVideoDecoderService; +interface IDirectXVideoProcessorService; @@ -17,7 +29,7 @@ cpp_quote("#define DXVA2_ProcAmp_None 0x0000") cpp_quote("#define DXVA2_ProcAmp_Brightness 0x0001") -@@ -142,19 +143,19 @@ +@@ -142,19 +147,19 @@ cpp_quote(" DXVA2_VideoTransferMatrix_SMPTE240M = 3 ") cpp_quote("} DXVA2_VideoTransferMatrix;") cpp_quote("") @@ -50,7 +62,7 @@ typedef struct _DXVA2_ConfigPictureDecode { GUID guidConfigBitstreamEncryption; -@@ -219,40 +220,40 @@ +@@ -219,40 +224,40 @@ }; } DXVA2_ExtendedFormat; @@ -119,7 +131,7 @@ typedef struct _DXVA2_VideoDesc { UINT SampleWidth; -@@ -317,57 +318,60 @@ +@@ -317,57 +322,60 @@ cpp_quote("DXVA2_DetailFilterTech_Edge") cpp_quote("DXVA2_DetailFilterTech_Sharpening") cpp_quote("*/") @@ -231,7 +243,7 @@ cpp_quote("/* Constants */") cpp_quote("") cpp_quote("#define DXVA2_VideoDecoderRenderTarget 0") -@@ -481,4 +485,82 @@ +@@ -481,4 +489,84 @@ [in] UINT NumRenderTargets, [out] IDirectXVideoDecoder **ppDecode); } @@ -314,3 +326,5 @@ +} + cpp_quote("#endif /* _D3D9_H_ */") ++ ++cpp_quote("#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */") _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
