Rebase against c55e8822ae3bbb8b1d3ab9b363214e4ad2f478d9

patches/dxva2-Video_Decoder/0004-dxva2-Implement-stubbed-DirectX-Software-VideoProces.patch

@@ -1,22 +1,22 @@
-From 7387aaf6f9344405a95f7fb6c27dfd0f87870d94 Mon Sep 17 00:00:00 2001
+From e0e77d995edd90bdc3d67cd60cf870d6c4a68b18 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 21 Feb 2015 15:06:03 +0100
-Subject: dxva2: Implement stubbed DirectX Software VideoProcessor interface.
+Subject: [PATCH] dxva2: Implement stubbed DirectX Software VideoProcessor
+ interface.
 
 ---
  dlls/dxva2/Makefile.in         |   3 +-
  dlls/dxva2/dxva2_private.h     |   3 +
- dlls/dxva2/softwareprocessor.c | 209 +++++++++++++++++++++++++++++++++++++++++
- dlls/dxva2/videoservices.c     |  17 +++-
- include/dxva2api.idl           |   5 +
- 5 files changed, 234 insertions(+), 3 deletions(-)
+ dlls/dxva2/softwareprocessor.c | 209 +++++++++++++++++++++++++++++++++
+ dlls/dxva2/videoservices.c     |  17 ++-
+ 4 files changed, 229 insertions(+), 3 deletions(-)
  create mode 100644 dlls/dxva2/softwareprocessor.c
 
 diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
-index b517921190b..d484cb14bf2 100644
+index c86b165e890..e4c90b5231e 100644
 --- a/dlls/dxva2/Makefile.in
 +++ b/dlls/dxva2/Makefile.in
-@@ -4,4 +4,5 @@ IMPORTS = ole32
+@@ -6,4 +6,5 @@ EXTRADLLFLAGS = -mno-cygwin
  C_SRCS = \
  	devicemanager.c \
  	main.c \
@@ -289,22 +289,6 @@ index 936aa37b43c..46e431a7f29 100644
      return E_NOTIMPL;
  }
  
-diff --git a/include/dxva2api.idl b/include/dxva2api.idl
-index 8dd1d961335..838411b22eb 100644
---- a/include/dxva2api.idl
-+++ b/include/dxva2api.idl
-@@ -86,6 +86,11 @@ cpp_quote("#define DXVA2_ModeVC1_VLD           DXVA2_ModeVC1_D")
- /* Encryption */
- cpp_quote("DEFINE_GUID(DXVA_NoEncrypt,         0x1b81bed0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);")
- 
-+/* Video Processor */
-+cpp_quote("DEFINE_GUID(DXVA2_VideoProcProgressiveDevice, 0x5a54a0c9, 0xc7ec,0x4bd9, 0x8e, 0xde, 0xf3, 0xc7, 0x5d, 0xc4, 0x39, 0x3b);")
-+cpp_quote("DEFINE_GUID(DXVA2_VideoProcBobDevice,         0x335aa36e, 0x7884,0x43a4, 0x9c, 0x91, 0x7f, 0x87, 0xfa, 0xf3, 0xe3, 0x7e);")
-+cpp_quote("DEFINE_GUID(DXVA2_VideoProcSoftwareDevice,    0x4553d47f, 0xee7e,0x4e3f, 0x94, 0x75, 0xdb, 0xf1, 0x37, 0x6c, 0x48, 0x10);")
-+
- cpp_quote("#ifndef REFERENCE_TIME_DEFINED")
- cpp_quote("#define REFERENCE_TIME_DEFINED")
- typedef LONGLONG REFERENCE_TIME;
 -- 
-2.14.1
+2.17.1