aboutsummaryrefslogtreecommitdiffstats
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-07-04 02:56:38 +0200
committerAnton Khirnov <anton@khirnov.net>2012-07-06 12:59:11 +0200
commit53ddd43f0c9aa9d1060d70a7e921e1ae74601947 (patch)
tree537a6e3c0b75596a165063e342f7a79bda417244 /avconv.c
parentb98c8f4f2bf5879ba5393a439f0fccf76a65e448 (diff)
downloadffmpeg-53ddd43f0c9aa9d1060d70a7e921e1ae74601947.tar.gz
avconv: use only meaningful timestamps in start time check.
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/avconv.c b/avconv.c
index c59916e3ed..fad0626c91 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1560,7 +1560,7 @@ static int poll_filters(void)
break;
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,
ost->filter->filter->inputs[0]->time_base,
ost->st->codec->time_base) -
@@ -1568,9 +1568,10 @@ static int poll_filters(void)
AV_TIME_BASE_Q,
ost->st->codec->time_base);
- if (of->start_time && filtered_frame->pts < 0) {
- avfilter_unref_buffer(picref);
- continue;
+ if (of->start_time && filtered_frame->pts < 0) {
+ avfilter_unref_buffer(picref);
+ continue;
+ }
}
switch (ost->filter->filter->inputs[0]->type) {