[vlc-commits] contribs: Fix ffmpeg build on UWP

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Jun  2 15:38:42 2017 +0200| [928c0e0b884eed60168a4cfcdd58ef54f4aa463c] | committer: Hugo Beauzée-Luyssen

contribs: Fix ffmpeg build on UWP

The patch was also sent upstream

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=928c0e0b884eed60168a4cfcdd58ef54f4aa463c
---

 contrib/src/ffmpeg/force-unicode.patch | 14 ++++++++++++++
 contrib/src/ffmpeg/rules.mak           |  3 +++
 2 files changed, 17 insertions(+)

diff --git a/contrib/src/ffmpeg/force-unicode.patch b/contrib/src/ffmpeg/force-unicode.patch
new file mode 100644
index 0000000000..25679cf7f8
--- /dev/null
+++ b/contrib/src/ffmpeg/force-unicode.patch
@@ -0,0 +1,14 @@
+--- ffmpeg/compat/w32dlfcn.h.old	2017-06-02 14:35:36.726230731 +0200
++++ ffmpeg/compat/w32dlfcn.h	2017-06-02 15:14:38.472865111 +0200
+@@ -71,7 +71,11 @@
+ #ifndef LOAD_LIBRARY_SEARCH_SYSTEM32
+ #   define LOAD_LIBRARY_SEARCH_SYSTEM32        0x00000800
+ #endif
++#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+     return LoadLibraryExA(name, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32);
++#else
++    return NULL;
++#endif
+ }
+ #define dlopen(name, flags) win32_dlopen(name)
+ #define dlclose FreeLibrary
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 5725e8f11e..eabf605179 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -224,6 +224,9 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
 	rm -Rf $@ $@-$(FFMPEG_BASENAME)
 	mkdir -p $@-$(FFMPEG_BASENAME)
 	tar xvJf "$<" --strip-components=1 -C $@-$(FFMPEG_BASENAME)
+ifdef USE_FFMPEG
+	$(APPLY) $(SRC)/ffmpeg/force-unicode.patch
+endif
 	$(MOVE)
 
 .ffmpeg: ffmpeg