Rebase against 50f889fd19d329bef7c001f9eafd1030fc1e3a56.

This commit is contained in:
Alistair Leslie-Hughes
2021-10-13 09:41:59 +11:00
parent f3fd4a3903
commit 1af920f698
6 changed files with 37 additions and 37 deletions

View File

@@ -1,18 +1,18 @@
From 12499caabc7010d8ba89f3886ecdadd636cbc123 Mon Sep 17 00:00:00 2001
From 05d5df3292d6ae3ad5b2fa540bedbc011285c4d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 8 Feb 2015 06:10:26 +0100
Subject: [PATCH] nvencodeapi: First implementation.
---
configure.ac | 2 +
dlls/nvencodeapi/Makefile.in | 4 +
dlls/nvencodeapi/Makefile.in | 5 +
dlls/nvencodeapi/nvencodeapi.c | 369 ++++++++++++++++++++++++++
dlls/nvencodeapi/nvencodeapi.spec | 1 +
dlls/nvencodeapi64/Makefile.in | 5 +
dlls/nvencodeapi64/Makefile.in | 6 +
dlls/nvencodeapi64/nvencodeapi64.spec | 1 +
include/Makefile.in | 1 +
include/nvencodeapi.h | 281 ++++++++++++++++++++
8 files changed, 664 insertions(+)
8 files changed, 666 insertions(+)
create mode 100644 dlls/nvencodeapi/Makefile.in
create mode 100644 dlls/nvencodeapi/nvencodeapi.c
create mode 100644 dlls/nvencodeapi/nvencodeapi.spec
@@ -21,10 +21,10 @@ Subject: [PATCH] nvencodeapi: First implementation.
create mode 100644 include/nvencodeapi.h
diff --git a/configure.ac b/configure.ac
index a278e6d30ac..3df3fb9ae18 100644
index f081f3fbb71..420e34e3245 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3613,6 +3613,8 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64)
@@ -3471,6 +3471,8 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64)
WINE_CONFIG_MAKEFILE(dlls/nvcuda)
WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests)
WINE_CONFIG_MAKEFILE(dlls/nvcuvid)
@@ -35,7 +35,7 @@ index a278e6d30ac..3df3fb9ae18 100644
WINE_CONFIG_MAKEFILE(dlls/odbcbcp)
diff --git a/dlls/nvencodeapi/Makefile.in b/dlls/nvencodeapi/Makefile.in
new file mode 100644
index 00000000000..a2e58acaf0d
index 00000000000..3b6a50ea828
--- /dev/null
+++ b/dlls/nvencodeapi/Makefile.in
@@ -0,0 +1,5 @@
@@ -428,7 +428,7 @@ index 00000000000..11d74e82d99
+@ stdcall NvEncodeAPICreateInstance(ptr)
diff --git a/dlls/nvencodeapi64/Makefile.in b/dlls/nvencodeapi64/Makefile.in
new file mode 100644
index 00000000000..8297ec352b5
index 00000000000..c6d72871f73
--- /dev/null
+++ b/dlls/nvencodeapi64/Makefile.in
@@ -0,0 +1,6 @@
@@ -446,11 +446,11 @@ index 00000000000..11d74e82d99
@@ -0,0 +1 @@
+@ stdcall NvEncodeAPICreateInstance(ptr)
diff --git a/include/Makefile.in b/include/Makefile.in
index 22ed27ed968..667b4640d80 100644
index 80d27a57d6c..a22e7803ac5 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -532,6 +532,7 @@ SOURCES = \
ntstatus.h \
@@ -558,6 +558,7 @@ SOURCES = \
ntuser.h \
nvapi.h \
nvcuvid.h \
+ nvencodeapi.h \
@@ -745,5 +745,5 @@ index 00000000000..45e9fb97f16
+
+#endif /* __WINE_NVENCODEAPI_H */
--
2.28.0
2.33.0