[vlc-commits] Contrib: remove FFmpeg unneeded patch

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Dec  4 10:09:48 2017 +0100| [b6c43967342dc0dab232f0428b6e898572a5128c] | committer: Jean-Baptiste Kempf

Contrib: remove FFmpeg unneeded patch

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

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

diff --git a/contrib/src/ffmpeg/force-unicode.patch b/contrib/src/ffmpeg/force-unicode.patch
deleted file mode 100644
index 25679cf7f8..0000000000
--- a/contrib/src/ffmpeg/force-unicode.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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 bf976e9e84..7008559bf9 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -224,9 +224,6 @@ 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