Rebase against 25a8773d21d0113dc5e4f9dee49d9d9dbeed347b.

patches/dxva2-Video_Decoder/0006-dxva2-tests-Add-tests-for-dxva2-decoder.patch

@@ -1,4 +1,4 @@
-From 1e3f6686e2daedc334871a6af186adbd628c2d92 Mon Sep 17 00:00:00 2001
+From 8cb1d2c62815a03ded72eebeb9ac0080f8e382a0 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:21:18 +0100
 Subject: dxva2/tests: Add tests for dxva2 decoder.
@@ -12,20 +12,20 @@ Subject: dxva2/tests: Add tests for dxva2 decoder.
  create mode 100644 dlls/dxva2/tests/dxva2.c
 
 diff --git a/configure.ac b/configure.ac
-index 7ab221b..37261ef 100644
+index edeeb0de6f9..fb65b3b357a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2993,6 +2993,7 @@ WINE_CONFIG_DLL(dxgi,,[implib])
+@@ -3120,6 +3120,7 @@ WINE_CONFIG_DLL(dxgi,,[implib])
  WINE_CONFIG_TEST(dlls/dxgi/tests)
  WINE_CONFIG_LIB(dxguid)
  WINE_CONFIG_DLL(dxva2)
 +WINE_CONFIG_TEST(dlls/dxva2/tests)
  WINE_CONFIG_DLL(esent)
  WINE_CONFIG_DLL(evr)
- WINE_CONFIG_DLL(explorerframe,,[clean])
+ WINE_CONFIG_TEST(dlls/evr/tests)
 diff --git a/dlls/dxva2/tests/Makefile.in b/dlls/dxva2/tests/Makefile.in
 new file mode 100644
-index 0000000..10d6af5
+index 00000000000..10d6af55667
 --- /dev/null
 +++ b/dlls/dxva2/tests/Makefile.in
 @@ -0,0 +1,5 @@
@@ -36,7 +36,7 @@ index 0000000..10d6af5
 +	dxva2.c
 diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c
 new file mode 100644
-index 0000000..dcbb990
+index 00000000000..dcbb990ee5c
 --- /dev/null
 +++ b/dlls/dxva2/tests/dxva2.c
 @@ -0,0 +1,371 @@
@@ -412,5 +412,5 @@ index 0000000..dcbb990
 +    test_decoder_service(window);
 +}
 -- 
-2.5.1
+2.14.1