From 1fe1a0d81b40b64a0b177bfae1d04d16a2bc0c6d Mon Sep 17 00:00:00 2001 From: Bradley Sepos Date: Sun, 3 Jun 2018 12:40:23 -0400 Subject: contrib: Remove workaround building x264 before FFmpeg. Issue should be fixed by 7cddc6fe8779e1e098b48ecdfddf6b2c15050578. --- contrib/ffmpeg/module.defs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'contrib/ffmpeg/module.defs') diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 8da046ec0..833fc9ad6 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -3,10 +3,6 @@ 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)) -- cgit v1.2.3