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

update ffmpeg version. update ogg duration patch

parent 6f34f402
......@@ -138,7 +138,7 @@ if not conf.CheckPKG(XIPH_LIBS):
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)):
......
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
......@@ -10,9 +10,9 @@ Index: libavformat/oggdec.c
+ 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;
+ }
+ }
......
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