From 3459356aa29a56c12234507077f0ebe2549ac380 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 20 Feb 2018 20:25:01 +1100 Subject: [PATCH] Updated nvencodeapi-Video_Encoder patchset --- ...001-nvencodeapi-First-implementation.patch | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch b/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch index 980a6dd3..0f50b0e8 100644 --- a/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch +++ b/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch @@ -1,7 +1,7 @@ -From 0822239b97314c586a3830968d755da6d0f27496 Mon Sep 17 00:00:00 2001 +From 7eca2e6f67b31baf24ff6bebc7359953972bb944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 8 Feb 2015 06:10:26 +0100 -Subject: nvencodeapi: First implementation. +Subject: [PATCH] nvencodeapi: First implementation. --- configure.ac | 2 + @@ -21,10 +21,10 @@ Subject: nvencodeapi: First implementation. create mode 100644 include/nvencodeapi.h diff --git a/configure.ac b/configure.ac -index 89b8d58..fcd6bc4 100644 +index 81d622db34..1c5a1dab30 100644 --- a/configure.ac +++ b/configure.ac -@@ -3153,6 +3153,8 @@ WINE_CONFIG_DLL(nvapi64,enable_win64) +@@ -3547,6 +3547,8 @@ WINE_CONFIG_DLL(nvapi64,enable_win64) WINE_CONFIG_DLL(nvcuda) WINE_CONFIG_TEST(dlls/nvcuda/tests) WINE_CONFIG_DLL(nvcuvid) @@ -35,7 +35,7 @@ index 89b8d58..fcd6bc4 100644 WINE_CONFIG_DLL(odbccp32,,[implib]) diff --git a/dlls/nvencodeapi/Makefile.in b/dlls/nvencodeapi/Makefile.in new file mode 100644 -index 0000000..a2e58ac +index 0000000000..a2e58acaf0 --- /dev/null +++ b/dlls/nvencodeapi/Makefile.in @@ -0,0 +1,4 @@ @@ -45,7 +45,7 @@ index 0000000..a2e58ac + nvencodeapi.c diff --git a/dlls/nvencodeapi/nvencodeapi.c b/dlls/nvencodeapi/nvencodeapi.c new file mode 100644 -index 0000000..91a33fd +index 0000000000..91a33fd589 --- /dev/null +++ b/dlls/nvencodeapi/nvencodeapi.c @@ -0,0 +1,370 @@ @@ -421,14 +421,14 @@ index 0000000..91a33fd +} diff --git a/dlls/nvencodeapi/nvencodeapi.spec b/dlls/nvencodeapi/nvencodeapi.spec new file mode 100644 -index 0000000..11d74e8 +index 0000000000..11d74e82d9 --- /dev/null +++ b/dlls/nvencodeapi/nvencodeapi.spec @@ -0,0 +1 @@ +@ stdcall NvEncodeAPICreateInstance(ptr) diff --git a/dlls/nvencodeapi64/Makefile.in b/dlls/nvencodeapi64/Makefile.in new file mode 100644 -index 0000000..8297ec3 +index 0000000000..8297ec352b --- /dev/null +++ b/dlls/nvencodeapi64/Makefile.in @@ -0,0 +1,5 @@ @@ -439,26 +439,26 @@ index 0000000..8297ec3 + nvencodeapi.c diff --git a/dlls/nvencodeapi64/nvencodeapi64.spec b/dlls/nvencodeapi64/nvencodeapi64.spec new file mode 100644 -index 0000000..11d74e8 +index 0000000000..11d74e82d9 --- /dev/null +++ b/dlls/nvencodeapi64/nvencodeapi64.spec @@ -0,0 +1 @@ +@ stdcall NvEncodeAPICreateInstance(ptr) diff --git a/include/Makefile.in b/include/Makefile.in -index a0232cd..464b0e2 100644 +index 8b23127251..06dcaba694 100644 --- a/include/Makefile.in +++ b/include/Makefile.in -@@ -514,6 +514,7 @@ HEADER_SRCS = \ +@@ -480,6 +480,7 @@ SOURCES = \ ntstatus.h \ nvapi.h \ nvcuvid.h \ + nvencodeapi.h \ + oaidl.idl \ objbase.h \ - objsel.h \ - odbcinst.h \ + objectarray.idl \ diff --git a/include/nvencodeapi.h b/include/nvencodeapi.h new file mode 100644 -index 0000000..45e9fb9 +index 0000000000..45e9fb97f1 --- /dev/null +++ b/include/nvencodeapi.h @@ -0,0 +1,281 @@ @@ -744,5 +744,5 @@ index 0000000..45e9fb9 + +#endif /* __WINE_NVENCODEAPI_H */ -- -2.7.1 +2.16.1