From d9706b939373abdc4904dd661032c90287e1cf39 Mon Sep 17 00:00:00 2001 From: Bradley Sepos Date: Tue, 29 May 2018 01:24:35 -0400 Subject: [PATCH] contrib: Disable AudioToolbox, CoreImage, VideoToolbox in FFmpeg. Fixes the build. Hardware acceleration should really be tested before we enable it, even in the nightly. --- contrib/ffmpeg/module.defs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 3547d70d4..1d9663ec7 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -84,6 +84,10 @@ FFMPEG.CONFIGURE.extra += \ --enable-muxer=psp \ --enable-muxer=ipod +ifeq (darwin,$(BUILD.system)) + FFMPEG.CONFIGURE.extra += --disable-audiotoolbox --disable-coreimage --disable-videotoolbox +endif + ## check against tuple: B-SYSTEM where B is { 0 | 1 } for cross-compiling flag ifeq (0-cygwin,$(BUILD.cross)-$(BUILD.system)) FFMPEG.GCC.args.extra += -fno-common -- 2.40.0