Commit ca24c604 authored by Jan Gerber's avatar Jan Gerber
Browse files

update ffmpeg to svn, update ogg duration patch

parent 3d82ae61
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
......@@ -12,7 +12,7 @@ Index: libavformat/oggdec.c
+ 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;
+ }
+ }
......
......@@ -1381,7 +1381,7 @@ static void print_stats(oggmux_info *info, double timebase) {
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment