[xiph-commits] r17207 - in trunk/ffmpeg2theora: . patches

[j at svn.xiph.org]

Author: j
Date: 2010-05-13 14:26:29 -0700 (Thu, 13 May 2010)
New Revision: 17207

Modified:
   trunk/ffmpeg2theora/SConstruct
   trunk/ffmpeg2theora/ffmpegrev
   trunk/ffmpeg2theora/patches/ogg_duration.patch
Log:
update ffmpeg version. update ogg duration patch

Modified: trunk/ffmpeg2theora/SConstruct
===================================================================
--- trunk/ffmpeg2theora/SConstruct	2010-05-13 17:48:52 UTC (rev 17206)
+++ trunk/ffmpeg2theora/SConstruct	2010-05-13 21:26:29 UTC (rev 17207)
@@ -138,7 +138,7 @@
   Exit(1) 
 ParsePKGConfig(env, XIPH_LIBS)
 
-FFMPEG_LIBS=["libavcodec >= 52.30.0", "libavformat", "libavdevice", "libpostproc", "libswscale"]
+FFMPEG_LIBS=["libavcodec >= 52.30.0", "libavdevice", "libavformat", "libpostproc", "libswscale"]
 if os.path.exists("./ffmpeg"):
   os.environ['PKG_CONFIG_PATH'] = "./ffmpeg/libavutil:./ffmpeg/libavformat:./ffmpeg/libavcodec:./ffmpeg/libavdevice:./ffmpeg/libswscale:./ffmpeg/libpostproc:" + os.environ.get('PKG_CONFIG_PATH', '')
 if not conf.CheckPKG(' '.join(FFMPEG_LIBS)): 

Modified: trunk/ffmpeg2theora/ffmpegrev
===================================================================
--- trunk/ffmpeg2theora/ffmpegrev	2010-05-13 17:48:52 UTC (rev 17206)
+++ trunk/ffmpeg2theora/ffmpegrev	2010-05-13 21:26:29 UTC (rev 17207)
@@ -1,8 +1,8 @@
-FFMPEG_REVISION=22168
+FFMPEG_REVISION=23009
 FFMPEG_CO_DIR=ffmpeg
 FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
 # 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=30819
+FFMPEG_EXTERNALS_REVISION=31128

Modified: trunk/ffmpeg2theora/patches/ogg_duration.patch
===================================================================
--- trunk/ffmpeg2theora/patches/ogg_duration.patch	2010-05-13 17:48:52 UTC (rev 17206)
+++ trunk/ffmpeg2theora/patches/ogg_duration.patch	2010-05-13 21:26:29 UTC (rev 17207)
@@ -10,9 +10,9 @@
 +    url_fseek (s->pb, 0, SEEK_SET);
 +    while (!ogg_read_page (s, &i)){
 +        if (ogg->streams[i].granule != -1 && ogg->streams[i].granule != 0 && 
-+            idx == i) {
-+            s->streams[idx]->duration -=
-+                ogg_gptopts (s, idx, ogg->streams[idx].granule, NULL);
++            ogg->streams[i].codec) {
++            s->streams[i]->duration -=
++                ogg_gptopts (s, i, ogg->streams[i].granule, NULL);
 +            break;
 +        }
 +    }