From: Good Guy <good1.2guy@gmail.com>
Date: Sun, 2 Aug 2015 18:30:59 +0000 (-0600)
Subject: allow ffmpeg video to resample curr_pos, add bluray format
X-Git-Url: http://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=9434103c1bdcdf44f5ea73c6ad629515c20e1caa;p=goodguy%2Fhistory.git

allow ffmpeg video to resample curr_pos, add bluray format
---

diff --git a/cinelerra-5.0/cinelerra/ffmpeg.C b/cinelerra-5.0/cinelerra/ffmpeg.C
index 7f0b5b77..a1a2f076 100644
--- a/cinelerra-5.0/cinelerra/ffmpeg.C
+++ b/cinelerra-5.0/cinelerra/ffmpeg.C
@@ -653,6 +653,7 @@ int FFVideoStream::video_seek(int64_t pos)
 	if( gop < 4 ) gop = 4;
 	if( gop > 64 ) gop = 64;
 	if( pos >= curr_pos && pos <= curr_pos + gop ) return 0;
+	if( pos == curr_pos-1 && curr_pos > seek_pos ) return 0;
 	if( !st->codec || !st->codec->codec ) return -1;
 	avcodec_flush_buffers(st->codec);
 // back up a few frames to read up to current to help repair damages