From: Felix Paul Kühne Date: Fri, 21 Oct 2005 14:17:48 +0000 (+0000) Subject: * use the latest ffmpeg-cvs again. Included dionoea's build fix (rev. [12607]). Thank... X-Git-Tag: 0.8.4~200 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7c18bb2239406913f2dc2a5986204c1115eca782;hp=524254f836416fba567be30b2b168d63811fb3a5;p=vlc * use the latest ffmpeg-cvs again. Included dionoea's build fix (rev. [12607]). Thanks to xtophe for pointing this out. --- diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 95ca337533..ce154d70fb 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -728,7 +728,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 ffmpeg: echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs - CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co -D "2005-09-27" ffmpeg + CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co ffmpeg patch -p 0 < Patches/ffmpeg.patch.cvs # (cd $@; ./bootstrap) @@ -740,7 +740,7 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz: # patch -p 0 < Patches/ffmpeg.patch .ffmpeg: ffmpeg - (cd $<; ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-audio-beos --disable-ffserver --enable-mp3lame --enable-a52 --disable-ffplay && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib && make -C libavutil installlib) + (cd $<; ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-audio-beos --disable-ffserver --enable-mp3lame --enable-a52 --disable-ffplay && echo -e "#define HAVE_LRINTF 1" >> config.h && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib && make -C libavutil installlib) touch $@ CLEAN_FILE += .ffmpeg