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

[j at svn.xiph.org]

Author: j
Date: 2010-01-28 00:03:46 -0800 (Thu, 28 Jan 2010)
New Revision: 16840

Modified:
   trunk/ffmpeg2theora/ffmpegrev
   trunk/ffmpeg2theora/patches/ogg_duration.patch
   trunk/ffmpeg2theora/src/theorautils.c
Log:
update ffmpeg to svn, update ogg duration patch

Modified: trunk/ffmpeg2theora/ffmpegrev
===================================================================
--- trunk/ffmpeg2theora/ffmpegrev	2010-01-28 07:10:02 UTC (rev 16839)
+++ trunk/ffmpeg2theora/ffmpegrev	2010-01-28 08:03:46 UTC (rev 16840)
@@ -1,8 +1,8 @@
-FFMPEG_REVISION=20906
+FFMPEG_REVISION=21500
 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=30099
+FFMPEG_EXTERNALS_REVISION=30448

Modified: trunk/ffmpeg2theora/patches/ogg_duration.patch
===================================================================
--- trunk/ffmpeg2theora/patches/ogg_duration.patch	2010-01-28 07:10:02 UTC (rev 16839)
+++ trunk/ffmpeg2theora/patches/ogg_duration.patch	2010-01-28 08:03:46 UTC (rev 16840)
@@ -12,7 +12,7 @@
 +        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);
++                ogg_gptopts (s, idx, ogg->streams[idx].granule, NULL);
 +            break;
 +        }
 +    }

Modified: trunk/ffmpeg2theora/src/theorautils.c
===================================================================
--- trunk/ffmpeg2theora/src/theorautils.c	2010-01-28 07:10:02 UTC (rev 16839)
+++ trunk/ffmpeg2theora/src/theorautils.c	2010-01-28 08:03:46 UTC (rev 16840)
@@ -1381,7 +1381,7 @@
                 remaining_seconds = (long) remaining % 60;
                 remaining_minutes = ((long) remaining / 60) % 60;
                 remaining_hours = (long) remaining / 3600;
-                fprintf (stderr,"\r  %d:%02d:%02d.%02d audio: %dkbps video: %dkbps, time elapsed: %02d:%02d:%02d               ",
+                fprintf (stderr,"\r  %d:%02d:%02d.%02d audio: %dkbps video: %dkbps, time elapsed: %02d:%02d:%02d           ",
                     hours, minutes, seconds, hundredths,
                     info->akbps, info->vkbps,
                     remaining_hours, remaining_minutes, remaining_seconds