(contrib) Fix bug in FFMPEGCONF define and disable bzlib usage by ffmpeg for win32.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f8c47942c55d60c9559414186709bcaa49b0029c..b114476eb98259489fce75e8fe13c6036e96ed3c 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1097,8 +1097,10 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
        $(EXTRACT_GZ)
 endif
 
-
-FFMPEGCONF = --enable-gpl --enable-postproc --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols --disable-network --enable-swscale
+FFMPEGCONF += --enable-gpl --enable-postproc --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols --disable-network --enable-swscale
+ifdef HAVE_WIN32
+FFMPEGCONF += --disable-bzlib
+endif
 
 ifdef HAVE_WINCE
 .ffmpeg: ffmpeg .zlib