Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avconv: use only meaningful timestamps in start time check.

Browse Source
pull/59/head
Anton Khirnov 13 years ago
parent b98c8f4f2b
commit 53ddd43f0c
1 changed files with 5 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      avconv.c

9
avconv.c
Unescape View File

@ -1560,7 +1560,7 @@ static int poll_filters(void)
break; break;
avfilter_copy_buf_props(filtered_frame, picref); avfilter_copy_buf_props(filtered_frame, picref);
if (picref->pts != AV_NOPTS_VALUE) if (picref->pts != AV_NOPTS_VALUE) {
filtered_frame->pts = av_rescale_q(picref->pts, filtered_frame->pts = av_rescale_q(picref->pts,
ost->filter->filter->inputs[0]->time_base, ost->filter->filter->inputs[0]->time_base,
ost->st->codec->time_base) - ost->st->codec->time_base) -
@ -1568,9 +1568,10 @@ static int poll_filters(void)
AV_TIME_BASE_Q, AV_TIME_BASE_Q,
ost->st->codec->time_base); ost->st->codec->time_base);
if (of->start_time && filtered_frame->pts < 0) { if (of->start_time && filtered_frame->pts < 0) {
avfilter_unref_buffer(picref); avfilter_unref_buffer(picref);
continue; continue;
}
} }
switch (ost->filter->filter->inputs[0]->type) { switch (ost->filter->filter->inputs[0]->type) {

Write Preview
Loading…
Cancel
Save