]> granicus.if.org Git - handbrake/commitdiff
contrib: Explicitly disable bzlib and zlib during FFmpeg configure.
authorBradley Sepos <bradley@bradleysepos.com>
Tue, 29 May 2018 10:27:02 +0000 (06:27 -0400)
committerBradley Sepos <bradley@bradleysepos.com>
Tue, 29 May 2018 10:27:02 +0000 (06:27 -0400)
Should have been more thorough in 74dbfebb28d9e65d2f43161bb2b3db8f94005a39.

contrib/ffmpeg/module.defs

index 0342e5a6de9c996eceabbbe466a9dbcbaeb6c2b2..173bc34593407f9a195447d4173647bb395e45b4 100644 (file)
@@ -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)"