summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/ffmpeg/module.defs2
-rw-r--r--libhb/stream.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index b47ebdda4..60979b45e 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -1,7 +1,7 @@
$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,BZIP2 FAAD2 ZLIB))
$(eval $(call import.CONTRIB.defs,FFMPEG))
-FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg-r20602.tar.bz2
+FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg-r20817.tar.bz2
FFMPEG.CONFIGURE.deps =
FFMPEG.CONFIGURE.env =
diff --git a/libhb/stream.c b/libhb/stream.c
index da2e5791d..d1244f5ee 100644
--- a/libhb/stream.c
+++ b/libhb/stream.c
@@ -2929,6 +2929,10 @@ static int ffmpeg_read( hb_stream_t *stream, hb_buffer_t *buf )
{
buf->start = buf->renderOffset;
}
+ else if ( buf->renderOffset == -1 && buf->start >= 0 )
+ {
+ buf->renderOffset = buf->start;
+ }
/*
* Check to see whether this video buffer is on a chapter