]> granicus.if.org Git - handbrake/commitdiff
contrib: Update to Libav 12.3.
authorBradley Sepos <bradley@bradleysepos.com>
Mon, 19 Feb 2018 15:05:44 +0000 (10:05 -0500)
committerBradley Sepos <bradley@bradleysepos.com>
Mon, 19 Feb 2018 15:06:08 +0000 (10:06 -0500)
Changelog: https://git.libav.org/?p=libav.git;a=blob;f=Changelog;hb=refs/tags/v12.3

Adds a workaround to ensure x264 is built first. Otherwise, it may fail to find nasm later.

Closes #1181.

contrib/ffmpeg/module.defs

index e89440d589b394101b833d723aec3d59614a5944..2957761fbee127b9a9f49387fa30ba0094d37727 100644 (file)
@@ -6,12 +6,16 @@ ifeq (1,$(FEATURE.qsv))
 __deps__ += LIBMFX
 endif
 
+# workaround for potential race condition
+# where x264 may fail to find nasm later
+__deps__ += X264
+
 $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FFMPEG))
 
-FFMPEG.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/libav-12.2.tar.gz
-FFMPEG.FETCH.url += https://libav.org/releases/libav-12.2.tar.gz
-FFMPEG.FETCH.sha256 = 49c3ccda32458192c00ab25b30f4d1a6a4772b83458cbbf3a25b210d0688f55c
+FFMPEG.FETCH.url    = https://download.handbrake.fr/handbrake/contrib/libav-12.3.tar.gz
+FFMPEG.FETCH.url   += https://libav.org/releases/libav-12.3.tar.gz
+FFMPEG.FETCH.sha256 = 115b659022dd387f662e26fbc5bc0cc14ec18daa100003ffd34f4da0479b272e
 
 FFMPEG.CONFIGURE.deps  =
 FFMPEG.CONFIGURE.host  =