Skip to content

V
vlc
Commit ba55fc3e authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Fix ffmpeg building on bugfix tree

parent b5215243
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
extras/contrib/src/Makefile
View file @ ba55fc3e
......@@ -116,7 +116,7 @@ ifdef HAVE_WINCE
HOSTCONF+= --without-pic --disable-shared
FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols
else
FFMPEGCONF+= --enable-mp3lame --enable-faac
FFMPEGCONF+= --enable-libmp3lame --enable-libfaac
endif
ifdef HAVE_BEOS
......@@ -947,7 +947,7 @@ ifdef HAVE_WINCE
else
.ffmpeg: ffmpeg .faac .lame
endif
(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-a52 --disable-ffplay && make install-libs install-headers)
(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-liba52 --disable-ffplay --disable-swscaler && make install-libs install-headers)
touch $@
CLEAN_FILE += .ffmpeg
......
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