Rebase against e9c69fde09f0aca171652aaa2e26db2ef075d243.

This commit is contained in:
Sebastian Lackner
2017-10-04 21:15:05 +02:00
parent 726c476b6a
commit 788e74086e
6 changed files with 12 additions and 66 deletions

View File

@@ -1,4 +1,4 @@
From 7c59478156e8e41714b825635740ec62b0f8bcb2 Mon Sep 17 00:00:00 2001
From 7387aaf6f9344405a95f7fb6c27dfd0f87870d94 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.
@@ -290,7 +290,7 @@ index 936aa37b43c..46e431a7f29 100644
}
diff --git a/include/dxva2api.idl b/include/dxva2api.idl
index 7a291570368..7388b373097 100644
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")
@@ -302,9 +302,9 @@ index 7a291570368..7388b373097 100644
+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;
enum
--
2.11.0
2.14.1