[vlc-commits] Contribs: update FFmpeg/libav hashes

[Jean-Baptiste Kempf]

vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Dec  4 01:50:16 2017 +0100| [04ef5df19537426d25d6622efebb1132f5ea80a7] | committer: Jean-Baptiste Kempf

Contribs: update FFmpeg/libav hashes

and make it easier to use a different FFmpeg fork

(cherry picked from commit d7816e451372913185a7b94ce0bb117646b07bb5)
(cherry picked from commit b6c43967342dc0dab232f0428b6e898572a5128c)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/ffmpeg/force-unicode.patch | 14 --------------
 contrib/src/ffmpeg/rules.mak           |  9 +++------
 2 files changed, 3 insertions(+), 20 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 41d16a4fb2..7008559bf9 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -4,12 +4,12 @@
 #USE_LIBAV ?= 1
 #USE_FFMPEG ?= 1
 
-ifdef USE_FFMPEG
-FFMPEG_HASH=a82468514048fb87d9bf38689866bc3b9aaccd02
+ifndef USE_LIBAV
+FFMPEG_HASH=5a93a85fd0ad62c6c9cdf69415959f116c015f0e
 FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
 FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
 else
-FFMPEG_HASH=825e463a170c7004c63030dc484b2b2de869227b
+FFMPEG_HASH=e171022c24c42b1e88a51bb3b4c27f13c87c85cb
 FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
 FFMPEG_GITURL := git://git.libav.org/libav.git
 endif
@@ -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