Skip to content

V
vlc-1.1
Commit 76aeb5e7 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

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

parent 695c8ce5
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
extras/contrib/src/Makefile
View file @ 76aeb5e7
...@@ -1097,8 +1097,10 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz ...@@ -1097,8 +1097,10 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
endif 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 ifdef HAVE_WINCE
.ffmpeg: ffmpeg .zlib .ffmpeg: ffmpeg .zlib
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment