[xiph-commits] r17261 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2010-05-30 09:14:52 -0700 (Sun, 30 May 2010)
New Revision: 17261

Modified:
   trunk/ffmpeg2theora/ffmpegrev
   trunk/ffmpeg2theora/get_ffmpeg_svn.sh
Log:
switch to ffmpeg 0.6 branch

Modified: trunk/ffmpeg2theora/ffmpegrev
===================================================================
--- trunk/ffmpeg2theora/ffmpegrev	2010-05-30 16:10:24 UTC (rev 17260)
+++ trunk/ffmpeg2theora/ffmpegrev	2010-05-30 16:14:52 UTC (rev 17261)
@@ -1,8 +1,9 @@
-FFMPEG_REVISION=23009
 FFMPEG_CO_DIR=ffmpeg
-FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
+FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/branches/0.6
+#not required fro 0.6 branch
 # Because ffmpeg checks out libswscale via an svn:externals, checking
 # out an old ffmpeg does not check out a corresponding libswscale.
 # Keep the swscale checkout manually synchronized, then. Update this
 # when you update FFMPEG_REVISION.
-FFMPEG_EXTERNALS_REVISION=31128
+#FFMPEG_REVISION=23309
+#FFMPEG_EXTERNALS_REVISION=31211

Modified: trunk/ffmpeg2theora/get_ffmpeg_svn.sh
===================================================================
--- trunk/ffmpeg2theora/get_ffmpeg_svn.sh	2010-05-30 16:10:24 UTC (rev 17260)
+++ trunk/ffmpeg2theora/get_ffmpeg_svn.sh	2010-05-30 16:14:52 UTC (rev 17261)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 common="--enable-version3 --enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis"
-common="$common --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-doc"
+common="$common --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --disable-doc"
 
 #optional, if you have those libs installed:
 #extra="--enable-libopencore-amrnb --enable-libopencore-amrwb"
@@ -9,6 +9,9 @@
 #apt-get install liba52-dev libfaad-dev libgsm1-dev
 #extra="$extra--enable-libfaad --enable-libgsm"
 
+#optional, if you have libvpx installed:
+#extra="--enable-libvpx"
+
 #linux
 options="$common --enable-pthreads $extra"
 
@@ -19,9 +22,12 @@
 . ./ffmpegrev
 
 #Get ffmpeg from svn
-svn -r $FFMPEG_REVISION co $FFMPEG_SVN $FFMPEG_CO_DIR
-svn update -r $FFMPEG_EXTERNALS_REVISION $FFMPEG_CO_DIR/libswscale
+#svn -r $FFMPEG_REVISION co $FFMPEG_SVN $FFMPEG_CO_DIR
+#svn update -r $FFMPEG_EXTERNALS_REVISION $FFMPEG_CO_DIR/libswscale
 
+#Get ffmpeg from svn 0.6 branch
+svn co $FFMPEG_SVN $FFMPEG_CO_DIR
+
 apply_patches() {
   cd ffmpeg
   for patch in ../patches/*.patch; do