From 83dfde11d85a3ee1a7583049c75f1044bd62c94b Mon Sep 17 00:00:00 2001 From: Bradley Sepos Date: Tue, 29 May 2018 06:27:02 -0400 Subject: [PATCH] contrib: Explicitly disable bzlib and zlib during FFmpeg configure. Should have been more thorough in 74dbfebb28d9e65d2f43161bb2b3db8f94005a39. --- contrib/ffmpeg/module.defs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 0342e5a6d..173bc3459 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -1,4 +1,4 @@ -__deps__ := YASM BZIP2 ZLIB FDKAAC LIBVPX LAME LIBOPUS LIBSPEEX +__deps__ := YASM FDKAAC LIBVPX LAME LIBOPUS LIBSPEEX ifeq (1,$(FEATURE.qsv)) __deps__ += LIBMFX endif @@ -61,6 +61,8 @@ FFMPEG.CONFIGURE.extra = \ --disable-decoder=msmpeg4_crystalhd \ --disable-decoder=vc1_crystalhd \ --disable-decoder=wmv3_crystalhd \ + --disable-bzlib \ + --disable-zlib \ --cc="$(FFMPEG.GCC.gcc)" \ --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)" -- 2.40.0