diff options
| author | jstebbins <[email protected]> | 2009-12-14 16:45:30 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-12-14 16:45:30 +0000 |
| commit | 4d312d2288983fd54866c447e667cbcedd0b9cbe (patch) | |
| tree | 27ee8529aa090c68d6b7ec0895da20b7cc310a48 | |
| parent | ffb46ad854c4f5a09597ff56a981841cfef6291a (diff) | |
bump ffmpeg to svn 20817
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3028 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/ffmpeg/module.defs | 2 | ||||
| -rw-r--r-- | libhb/stream.c | 4 |
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 |