From 5ae8c7fc0eea926806606568bb29dbee03ef4236 Mon Sep 17 00:00:00 2001 From: Bradley Sepos Date: Wed, 6 Jun 2018 22:08:56 -0400 Subject: contrib: Only enable FFmpeg AMF configure options when VCE enabled. --- contrib/ffmpeg/module.defs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'contrib') diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 783088bfd..2cdfb8e3d 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -49,9 +49,6 @@ FFMPEG.CONFIGURE.extra = \ --enable-encoder=libvpx_vp8 \ --enable-encoder=libvpx_vp9 \ --disable-decoder=*_crystalhd \ - --enable-amf \ - --enable-encoder=h264_amf \ - --enable-encoder=hevc_amf \ --cc="$(FFMPEG.GCC.gcc)" \ --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)" @@ -113,6 +110,10 @@ ifeq (1,$(FEATURE.qsv)) FFMPEG.CONFIGURE.extra += --enable-libmfx endif +ifeq (1,$(FEATURE.vce)) + FFMPEG.CONFIGURE.extra += --enable-amf --enable-encoder=h264_amf --enable-encoder=hevc_amf +endif + ## enable compile verbosity FFMPEG.BUILD.extra = V=1 -- cgit v1.2.3