Rebase against 781b88b7c586fc295780f0c8ad76bda0ffe96cd1.

This commit is contained in:
Sebastian Lackner
2015-10-01 20:41:57 +02:00
parent b951b9ad09
commit 74daa3b210
15 changed files with 107 additions and 278 deletions

View File

@@ -1,4 +1,4 @@
From d8850f844e13d73a850219a12b330bdbe3e995fe Mon Sep 17 00:00:00 2001
From 1e3f6686e2daedc334871a6af186adbd628c2d92 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,17 +12,17 @@ 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 f611fa5..22b46ae 100644
index 7ab221b..37261ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2941,6 +2941,7 @@ WINE_CONFIG_DLL(dxgi,,[implib])
@@ -2993,6 +2993,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/explorerframe/tests)
diff --git a/dlls/dxva2/tests/Makefile.in b/dlls/dxva2/tests/Makefile.in
new file mode 100644
index 0000000..10d6af5
@@ -412,5 +412,5 @@ index 0000000..dcbb990
+ test_decoder_service(window);
+}
--
2.1.0
2.5.1