[xiph-commits] r11482 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2006-05-31 03:13:48 -0700 (Wed, 31 May 2006)
New Revision: 11482

Added:
   trunk/ffmpeg2theora/get_ffmpeg_svn.sh
Removed:
   trunk/ffmpeg2theora/get_ffmpeg_cvs.sh
Modified:
   trunk/ffmpeg2theora/INSTALL
Log:
ffmpeg is in svn now. update script and docs

Modified: trunk/ffmpeg2theora/INSTALL
===================================================================
--- trunk/ffmpeg2theora/INSTALL	2006-05-31 00:02:44 UTC (rev 11481)
+++ trunk/ffmpeg2theora/INSTALL	2006-05-31 10:13:48 UTC (rev 11482)
@@ -1,20 +1,16 @@
 Compiling from SVN
 ------------------
-If you downloaded through SVN, you will not already have a ./configure 
-script. You will need to build one.
-You will need:
-automake 1.6 or later
-libtools
-then run ./autogen.sh
+If you donwloaded ffmpeg2theora from svn you have
+need automake 1.6 or later to build the configure script.
+To do this run ./autogen.sh
 Then build as you would from a tarball.
 
-
 Compiling from tarball:
----------------------------------
+-----------------------
 you need
-- the latest version of libtheora ( http://www.theora.org/files )
-- ffmpeg-cvs ( http://ffmpeg.sf.net ) by running ./get_ffmpeg_cvs.sh
-  (this script downloads current CVS ffmpeg, runs an appropriate
+- the latest version of libtheora <http://downloads.xiph.org/releases/theora/>
+- ffmpeg-trunk <http://ffmpeg.sf.net> by running ./get_ffmpeg_svn.sh
+  (this script downloads current ffmpeg trunk, runs an appropriate
   configure and builds ffmpeg)
 
 if you did not install ffmpeg but want to staticly link it
@@ -49,5 +45,7 @@
 --------------
 
 right now vhooks only work if you install ffmpeg and use 
-the installed shared libs. otherwise i get errors like
+the installed shared libs. otherwise one gets errors like this:
  undefined symbol: av_read_frame
+this is a known limitation of vhooks in ffmpeg.
+

Deleted: trunk/ffmpeg2theora/get_ffmpeg_cvs.sh
===================================================================
--- trunk/ffmpeg2theora/get_ffmpeg_cvs.sh	2006-05-31 00:02:44 UTC (rev 11481)
+++ trunk/ffmpeg2theora/get_ffmpeg_cvs.sh	2006-05-31 10:13:48 UTC (rev 11482)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-#optional, if you have the libs installed:
-#extra="--enable-faad --enable-libgsm --enable-amr_nb --enable-amr_nb-fixed --enable-amr_wb --enable-amr_if2 --enable-dts"
-
-common="--enable-libogg --enable-theora --enable-a52 --enable-gpl --disable-encoders"
-
-#linux
-options="$common --enable-pthreads $extra"
-
-#mingw32
-uname | grep MINGW && options="$common --enable-memalign-hack --enable-mingw32 --extra-cflags=-I/usr/local/include --extra-ldflags=-L/usr/local/lib $extra"
-
-cvs -z3 -d:pserver:anonymous at cvs.mplayerhq.hu:/cvsroot/ffmpeg co ffmpeg
-cd ffmpeg && ./configure $options && make

Copied: trunk/ffmpeg2theora/get_ffmpeg_svn.sh (from rev 11469, trunk/ffmpeg2theora/get_ffmpeg_cvs.sh)
===================================================================
--- trunk/ffmpeg2theora/get_ffmpeg_cvs.sh	2006-05-30 16:31:52 UTC (rev 11469)
+++ trunk/ffmpeg2theora/get_ffmpeg_svn.sh	2006-05-31 10:13:48 UTC (rev 11482)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+#optional, if you have the libs installed:
+#extra="--enable-faad --enable-libgsm --enable-amr_nb --enable-amr_nb-fixed --enable-amr_wb --enable-amr_if2 --enable-dts"
+
+common="--enable-libogg --enable-theora --enable-a52 --enable-gpl --disable-encoders"
+
+#linux
+options="$common --enable-pthreads $extra"
+
+#mingw32
+uname | grep MINGW && options="$common --enable-memalign-hack --enable-mingw32 --extra-cflags=-I/usr/local/include --extra-ldflags=-L/usr/local/lib $extra"
+
+svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
+cd ffmpeg && ./configure $options && make