[Sumover-dev] [svn commit] r4163 - vic/branches/mpeg4
sumover-dev at cs.ucl.ac.uk
sumover-dev at cs.ucl.ac.uk
Sun May 25 17:13:27 BST 2008
Author: piers
Date: Sun May 25 17:13:26 2008
New Revision: 4163
Modified:
vic/branches/mpeg4/configure.in
Log:
- updated ffmpeg checkout and build
- x264 is now downloaded from videolan's snapshot directory
Modified: vic/branches/mpeg4/configure.in
==============================================================================
--- vic/branches/mpeg4/configure.in (original)
+++ vic/branches/mpeg4/configure.in Sun May 25 17:13:26 2008
@@ -83,14 +83,16 @@
if test "$ffmpegco" = "yes" ; then
if test "$gpl" = "yes" ; then
#if test ! -r "ffmpeg" ; then
- echo "checking out r7110 (and 21687 of libswscale) of ffmpeg from svn://svn.mplayerhq.hu/ffmpeg/trunk..."
+ echo "checking out HEAD of ffmpeg from svn://svn.mplayerhq.hu/ffmpeg/trunk..."
+ #echo "checking out r7110 (and 21687 of libswscale) of ffmpeg from svn://svn.mplayerhq.hu/ffmpeg/trunk..."
+ svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
#svn checkout -r 7110 svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
#svn checkout -r 21687 svn://svn.mplayerhq.hu/mplayer/trunk/libswscale ffmpeg/libswscale
echo "Configuring ffmpeg..."
- cd ffmpeg; ./configure --prefix=$V_PATH/ffmpeg $ppc_conf --enable-gpl --enable-swscaler --enable-pp; cd ..
+ cd ffmpeg; ./configure --prefix=$V_PATH/ffmpeg $ppc_conf --enable-gpl --enable-swscale --enable-postproc; cd ..
#fi
- V_INCLUDE="$V_INCLUDE -Iffmpeg/libavformat -Iffmpeg/include/ffmpeg -Iffmpeg/include"
- V_CODEC_LIB="$V_CODEC_LIB ffmpeg/lib/libavcodec.a ffmpeg/lib/libavutil.a ffmpeg/lib/libswscale.a ffmpeg/lib/libpostproc.a"
+ V_INCLUDE="$V_INCLUDE -Iffmpeg/include -Iffmpeg"
+ V_CODEC_LIB="$V_CODEC_LIB ffmpeg/libavcodec/libavcodec.a ffmpeg/libavutil/libavutil.a ffmpeg/libswscale/libswscale.a ffmpeg/libpostproc/libpostproc.a"
else
echo "ffmpeg not available without --enable-gpl"
fi
@@ -100,8 +102,10 @@
if test "$x264co" = "yes" ; then
if test "$gpl" = "yes" ; then
if test ! -r "x264" ; then
- echo "checking out r650 of x264 from svn co svn://svn.videolan.org/x264/trunk..."
- svn checkout -r 650 svn://svn.videolan.org/x264/trunk x264
+ X264_SNAP="x264-snapshot-20070413-2245"
+ echo "Downloading ${X264_SNAP} (r650) of x264 from videolan.org ..."
+ #svn checkout -r 650 svn://svn.videolan.org/x264/trunk x264
+ curl -s http://downloads.videolan.org/pub/videolan/x264/snapshots/${X264_SNAP}.tar.bz2 | tar xfj - && ln -s ${X264_SNAP} x264
echo "Configuring x264..."
cd x264; ./configure --prefix=$V_PATH/x264; cd ..
fi
More information about the Sumover-dev
mailing list