]> granicus.if.org Git - handbrake/commitdiff
contrib: Only enable FFmpeg AMF configure options when VCE enabled.
authorBradley Sepos <bradley@bradleysepos.com>
Thu, 7 Jun 2018 02:08:56 +0000 (22:08 -0400)
committerBradley Sepos <bradley@bradleysepos.com>
Thu, 7 Jun 2018 02:09:09 +0000 (22:09 -0400)
contrib/ffmpeg/module.defs

index 783088bfd8a3b46500e078b9029e6434a7cc2e9a..2cdfb8e3d0d027e0148c6444a53ddb33cd9b8731 100644 (file)
@@ -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