Changeset 7c18bb2239406913f2dc2a5986204c1115eca782

Show
Ignore:
Timestamp:
21/10/05 16:17:48 (3 years ago)
Author:
Felix Paul Kühne <fkuehne@videolan.org>
git-committer:
Felix Paul Kühne <fkuehne@videolan.org> 1129904268 +0000
git-parent:

[524254f836416fba567be30b2b168d63811fb3a5]

git-author:
Felix Paul Kühne <fkuehne@videolan.org> 1129904268 +0000
Message:

* use the latest ffmpeg-cvs again. Included dionoea's build fix (rev. [12607]). Thanks to xtophe for pointing this out.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/contrib/src/Makefile

    r7d31e60 r7c18bb2  
    729729ffmpeg: 
    730730    echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs 
    731     CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co -D "2005-09-27" ffmpeg 
     731    CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co ffmpeg 
    732732    patch -p 0 < Patches/ffmpeg.patch.cvs 
    733733#   (cd $@; ./bootstrap) 
    …… 
    741741 
    742742.ffmpeg: ffmpeg 
    743     (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) 
     743    (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) 
    744744    touch $@ 
    745745