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:
265feb1
)
ffmpeg frame reset retry to push design limits
author
Good Guy
<good1.2guy@gmail.com>
Mon, 11 Sep 2017 20:17:57 +0000
(14:17 -0600)
committer
Good Guy
<good1.2guy@gmail.com>
Mon, 11 Sep 2017 20:17:57 +0000
(14:17 -0600)
cinelerra-5.1/cinelerra/ffmpeg.C
patch
|
blob
|
history
diff --git
a/cinelerra-5.1/cinelerra/ffmpeg.C
b/cinelerra-5.1/cinelerra/ffmpeg.C
index 74b32cf115c2f176a711f098ff59344e5144b46b..dcbb49c63d4eeee18333df5bbacac178112e0d39 100644
(file)
--- a/
cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/
cinelerra-5.1/cinelerra/ffmpeg.C
@@
-739,6
+739,7
@@
int FFAudioStream::load(int64_t pos, int len)
init_swr(frame->channels, frame->format, frame->sample_rate);
load_history(&frame->extended_data[0], frame->nb_samples);
curr_pos += frame->nb_samples;
+ i = 0;
}
}
if( end_pos > curr_pos ) {
@@
-868,7
+869,7
@@
int FFVideoStream::load(VFrame *vframe, int64_t pos)
}
for( int i=0; ret>=0 && !flushed && curr_pos<=pos && i<MAX_RETRY; ++i ) {
ret = read_frame(frame);
- if( ret > 0 )
++curr_pos;
+ if( ret > 0 )
{ ++curr_pos; i = 0; }
}
if( frame->format == AV_PIX_FMT_NONE || frame->width <= 0 || frame->height <= 0 )
ret = -1;