projects
/
goodguy
/
history.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
94e8dc2
)
allow ffmpeg video to resample curr_pos, add bluray format
author
Good Guy
<good1.2guy@gmail.com>
Sun, 2 Aug 2015 18:30:59 +0000
(12:30 -0600)
committer
Good Guy
<good1.2guy@gmail.com>
Sun, 2 Aug 2015 18:30:59 +0000
(12:30 -0600)
cinelerra-5.0/cinelerra/ffmpeg.C
patch
|
blob
|
history
diff --git
a/cinelerra-5.0/cinelerra/ffmpeg.C
b/cinelerra-5.0/cinelerra/ffmpeg.C
index 7f0b5b77431c1f6ed987fff889400a39077a3865..a1a2f0766cb4335dfc32f461f9e74b5a31af83d1 100644
(file)
--- 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