Rebase against f870aa4988fa8e980919c144682da72865364ff0.

patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch

@@ -1,4 +1,4 @@
-From 07350060c944e605824dc4a849bf320e5a41ab32 Mon Sep 17 00:00:00 2001
+From aaf02d5e9c8e3d5d90ac3a1bae16df9669385011 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.
@@ -6,12 +6,12 @@ Subject: [PATCH] nvencodeapi: First implementation.
 ---
  configure.ac                          |   2 +
  dlls/nvencodeapi/Makefile.in          |   4 +
- dlls/nvencodeapi/nvencodeapi.c        | 370 ++++++++++++++++++++++++++++++++++
+ dlls/nvencodeapi/nvencodeapi.c        | 370 ++++++++++++++++++++++++++
  dlls/nvencodeapi/nvencodeapi.spec     |   1 +
  dlls/nvencodeapi64/Makefile.in        |   5 +
  dlls/nvencodeapi64/nvencodeapi64.spec |   1 +
  include/Makefile.in                   |   1 +
- include/nvencodeapi.h                 | 281 ++++++++++++++++++++++++++
+ include/nvencodeapi.h                 | 281 +++++++++++++++++++
  8 files changed, 665 insertions(+)
  create mode 100644 dlls/nvencodeapi/Makefile.in
  create mode 100644 dlls/nvencodeapi/nvencodeapi.c
@@ -21,10 +21,10 @@ Subject: [PATCH] nvencodeapi: First implementation.
  create mode 100644 include/nvencodeapi.h
 
 diff --git a/configure.ac b/configure.ac
-index d1367f4..40f96df 100644
+index 326d03975..a2f06d7ff 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3566,6 +3566,8 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64)
+@@ -3555,6 +3555,8 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64)
  WINE_CONFIG_MAKEFILE(dlls/nvcuda)
  WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests)
  WINE_CONFIG_MAKEFILE(dlls/nvcuvid)
@@ -32,10 +32,10 @@ index d1367f4..40f96df 100644
 +WINE_CONFIG_MAKEFILE(dlls/nvencodeapi64,enable_win64)
  WINE_CONFIG_MAKEFILE(dlls/objsel)
  WINE_CONFIG_MAKEFILE(dlls/odbc32)
- WINE_CONFIG_MAKEFILE(dlls/odbccp32)
+ WINE_CONFIG_MAKEFILE(dlls/odbcbcp)
 diff --git a/dlls/nvencodeapi/Makefile.in b/dlls/nvencodeapi/Makefile.in
 new file mode 100644
-index 0000000..a2e58ac
+index 000000000..a2e58acaf
 --- /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 000000000..91a33fd58
 --- /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 000000000..11d74e82d
 --- /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 000000000..8297ec352
 --- /dev/null
 +++ b/dlls/nvencodeapi64/Makefile.in
 @@ -0,0 +1,5 @@
@@ -439,16 +439,16 @@ 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 000000000..11d74e82d
 --- /dev/null
 +++ b/dlls/nvencodeapi64/nvencodeapi64.spec
 @@ -0,0 +1 @@
 +@ stdcall NvEncodeAPICreateInstance(ptr)
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 8b23127..06dcaba 100644
+index c38dd2ad1..5b21ec0df 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -480,6 +480,7 @@ SOURCES = \
+@@ -500,6 +500,7 @@ SOURCES = \
  	ntstatus.h \
  	nvapi.h \
  	nvcuvid.h \
@@ -458,7 +458,7 @@ index 8b23127..06dcaba 100644
  	objectarray.idl \
 diff --git a/include/nvencodeapi.h b/include/nvencodeapi.h
 new file mode 100644
-index 0000000..45e9fb9
+index 000000000..45e9fb97f
 --- /dev/null
 +++ b/include/nvencodeapi.h
 @@ -0,0 +1,281 @@
@@ -744,5 +744,5 @@ index 0000000..45e9fb9
 +
 +#endif /* __WINE_NVENCODEAPI_H */
 -- 
-1.9.1
+2.24.0