[Sumover-dev] [svn commit] r4164 - vic/branches/mpeg4

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Sun May 25 17:19:33 2008
New Revision: 4164

Modified:
   vic/branches/mpeg4/configure

Log:
Updated for ffmpeg and x264 changes in configure.in


Modified: vic/branches/mpeg4/configure
==============================================================================
--- vic/branches/mpeg4/configure	(original)
+++ vic/branches/mpeg4/configure	Sun May 25 17:19:33 2008
@@ -4952,14 +4952,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
@@ -4975,8 +4977,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