[xiph-commits] r15804 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2009-03-20 08:11:43 -0700 (Fri, 20 Mar 2009)
New Revision: 15804

Modified:
   trunk/ffmpeg2theora/ChangeLog
   trunk/ffmpeg2theora/SConstruct
   trunk/ffmpeg2theora/ffmpegrev
   trunk/ffmpeg2theora/get_ffmpeg_svn.sh
Log:
switch back to ffmpeg 0.5 branch, a/v issues not solved in trunk

Modified: trunk/ffmpeg2theora/ChangeLog
===================================================================
--- trunk/ffmpeg2theora/ChangeLog	2009-03-20 13:20:06 UTC (rev 15803)
+++ trunk/ffmpeg2theora/ChangeLog	2009-03-20 15:11:43 UTC (rev 15804)
@@ -1,6 +1,5 @@
 svn
     - fix input from codecs with visible vs. encoded width
-    - update ffmpeg to fix a/v sync issues in some mov/mp4 files
 
 0.24 2009-03-12
     - fix to make --max_size --no_upscaling work

Modified: trunk/ffmpeg2theora/SConstruct
===================================================================
--- trunk/ffmpeg2theora/SConstruct	2009-03-20 13:20:06 UTC (rev 15803)
+++ trunk/ffmpeg2theora/SConstruct	2009-03-20 15:11:43 UTC (rev 15804)
@@ -128,11 +128,10 @@
 for lib in FFMPEG_LIBS.split():
     ParsePKGConfig(env, lib)
 
-#FIXME: this no longer works with ffmpeg trunk
-#if conf.CheckCHeader('libavformat/framehook.h'):
-#    env.Append(CCFLAGS=[
-#      '-DHAVE_FRAMEHOOK'
-#    ])
+if conf.CheckCHeader('libavformat/framehook.h'):
+    env.Append(CCFLAGS=[
+      '-DHAVE_FRAMEHOOK'
+    ])
 
 KATE_LIBS="oggkate"
 if os.path.exists("./libkate/misc/pkgconfig"):

Modified: trunk/ffmpeg2theora/ffmpegrev
===================================================================
--- trunk/ffmpeg2theora/ffmpegrev	2009-03-20 13:20:06 UTC (rev 15803)
+++ trunk/ffmpeg2theora/ffmpegrev	2009-03-20 15:11:43 UTC (rev 15804)
@@ -1,8 +1,8 @@
-FFMPEG_REVISION=18071
+FFMPEG_REVISION=17942
 FFMPEG_CO_DIR=ffmpeg
-FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
+FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/branches/0.5
 # 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=29008
+FFMPEG_EXTERNALS_REVISION=28777

Modified: trunk/ffmpeg2theora/get_ffmpeg_svn.sh
===================================================================
--- trunk/ffmpeg2theora/get_ffmpeg_svn.sh	2009-03-20 13:20:06 UTC (rev 15803)
+++ trunk/ffmpeg2theora/get_ffmpeg_svn.sh	2009-03-20 15:11:43 UTC (rev 15804)
@@ -7,7 +7,7 @@
 #apt-get install liba52-dev libfaad-dev libgsm1-dev
 #extra=" --enable-libfaad --enable-libgsm"
 
-common="--enable-gpl --enable-postproc --disable-encoders --enable-libvorbis"
+common="--enable-gpl --enable-swscale --enable-postproc --disable-encoders --enable-libvorbis"
 
 #linux
 options="$common --enable-pthreads $extra"