From: Bradley Sepos Date: Sun, 3 Jun 2018 21:08:56 +0000 (-0400) Subject: contrib: Move FFmpeg dep AMF into conditional. X-Git-Tag: 1.2.0~409 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86ad9b9acde85a8c25d1ccea76ef3b25295be4e0;p=handbrake contrib: Move FFmpeg dep AMF into conditional. Practically, there is no difference. But this is how QSV was done and is easy to read. --- diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index f3ae0b1dd..2fbdd1cff 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -1,7 +1,10 @@ -__deps__ := YASM AMF BZIP2 ZLIB FDKAAC LIBVPX LAME LIBOPUS LIBSPEEX XZ +__deps__ := YASM BZIP2 ZLIB FDKAAC LIBVPX LAME LIBOPUS LIBSPEEX XZ ifeq (1,$(FEATURE.qsv)) __deps__ += LIBMFX endif +ifeq (1,$(FEATURE.vce)) +__deps__ += AMF +endif $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,$(__deps__))) $(eval $(call import.CONTRIB.defs,FFMPEG))