From: Bradley Sepos <bradley@bradleysepos.com>
Date: Tue, 29 May 2018 22:26:03 +0000 (-0400)
Subject: Revert "contrib: Explicitly disable bzlib and zlib during FFmpeg configure."
X-Git-Tag: 1.2.0~429
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bea1fc6363a0da70b3dcd84ffd071d124b9dda47;p=handbrake

Revert "contrib: Explicitly disable bzlib and zlib during FFmpeg configure."

This reverts commit 83dfde11d85a3ee1a7583049c75f1044bd62c94b.

Apparently, I was correct the first time around and these need to be enabled, just not explicitly.
---

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index d671dbe81..93a340e2a 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -1,4 +1,4 @@
-__deps__ := YASM FDKAAC LIBVPX LAME LIBOPUS LIBSPEEX XZ
+__deps__ := YASM BZIP2 ZLIB FDKAAC LIBVPX LAME LIBOPUS LIBSPEEX XZ
 ifeq (1,$(FEATURE.qsv))
 __deps__ += LIBMFX
 endif
@@ -61,8 +61,6 @@ FFMPEG.CONFIGURE.extra = \
     --disable-decoder=msmpeg4_crystalhd \
     --disable-decoder=vc1_crystalhd \
     --disable-decoder=wmv3_crystalhd \
-    --disable-bzlib \
-    --disable-zlib \
     --enable-lzma \
     --cc="$(FFMPEG.GCC.gcc)" \
     --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)"