diff options
| author | Bradley Sepos <[email protected]> | 2018-06-03 12:40:23 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-06-03 12:40:23 -0400 |
| commit | 1fe1a0d81b40b64a0b177bfae1d04d16a2bc0c6d (patch) | |
| tree | eb12700a72182e90beea4b33e9347140e397842b /contrib | |
| parent | b8c1375e6b71974ec00206905a30ee7d88a61065 (diff) | |
contrib: Remove workaround building x264 before FFmpeg.
Issue should be fixed by 7cddc6fe8779e1e098b48ecdfddf6b2c15050578.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ffmpeg/module.defs | 4 |
1 files changed, 0 insertions, 4 deletions
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)) |