Rebase against 538263d0efe725124df88ce1cce124bc3ad7e2af

patches/dxva2-Video_Decoder/0005-include-Add-dxva.h-header-file.patch

@@ -1,7 +1,7 @@
-From b705357e89463258880e8f7605a33285d5eb0530 Mon Sep 17 00:00:00 2001
+From 43b9548b90ae22fd1b3247e5bca51795e33c9970 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 22 Feb 2015 01:10:21 +0100
-Subject: include: Add dxva.h header file.
+Subject: [PATCH] include: Add dxva.h header file.
 
 ---
  include/Makefile.in |   1 +
@@ -10,20 +10,20 @@ Subject: include: Add dxva.h header file.
  create mode 100644 include/dxva.h
 
 diff --git a/include/Makefile.in b/include/Makefile.in
-index fd52a5f65a0..31d7fff6c2f 100644
+index f1bcba3..563d10c 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -374,6 +374,7 @@ HEADER_SRCS = \
- 	dxerr8.h \
- 	dxerr9.h \
- 	dxfile.h \
+@@ -245,6 +245,7 @@ SOURCES = \
+ 	dxgicommon.idl \
+ 	dxgiformat.idl \
+ 	dxgitype.idl \
 +	dxva.h \
- 	errorrep.h \
- 	errors.h \
- 	evcode.h \
+ 	dxva2api.idl \
+ 	dyngraph.idl \
+ 	endpointvolume.idl \
 diff --git a/include/dxva.h b/include/dxva.h
 new file mode 100644
-index 00000000000..e311488775a
+index 0000000..e311488
 --- /dev/null
 +++ b/include/dxva.h
 @@ -0,0 +1,215 @@
@@ -243,5 +243,5 @@ index 00000000000..e311488775a
 +
 +#endif /* __WINE_DXVA_H */
 -- 
-2.14.1
+1.9.1