vlc | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Mon Dec 4 01:50:16 2017 +0100| [d7816e451372913185a7b94ce0bb117646b07bb5] | committer: Jean-Baptiste Kempf
Contribs: update FFmpeg/libav hashes and make it easier to use a different FFmpeg fork > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d7816e451372913185a7b94ce0bb117646b07bb5 --- contrib/src/ffmpeg/rules.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 41d16a4fb2..bf976e9e84 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 _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits