ffmpeg | branch: master | Paul B Mahol <one...@gmail.com> | Sun Jul 14 17:53:35 2019 +0200| [be822eb6f880543bf4c7f5094f7062f90c7c97c1] | committer: Paul B Mahol
avfilter/vf_remap: use time_base from framesync Fixes non-monotonous timestamps. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be822eb6f880543bf4c7f5094f7062f90c7c97c1 --- libavfilter/vf_remap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_remap.c b/libavfilter/vf_remap.c index 48ec38af7c..2603997a2b 100644 --- a/libavfilter/vf_remap.c +++ b/libavfilter/vf_remap.c @@ -279,7 +279,7 @@ static int process_frame(FFFrameSync *fs) td.step = s->step; ctx->internal->execute(ctx, s->remap_slice, &td, NULL, FFMIN(outlink->h, ff_filter_get_nb_threads(ctx))); } - out->pts = av_rescale_q(in->pts, s->fs.time_base, outlink->time_base); + out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base); return ff_filter_frame(outlink, out); } @@ -305,7 +305,6 @@ static int config_output(AVFilterLink *outlink) outlink->w = xlink->w; outlink->h = xlink->h; - outlink->time_base = srclink->time_base; outlink->sample_aspect_ratio = srclink->sample_aspect_ratio; outlink->frame_rate = srclink->frame_rate; @@ -329,7 +328,10 @@ static int config_output(AVFilterLink *outlink) s->fs.opaque = s; s->fs.on_event = process_frame; - return ff_framesync_configure(&s->fs); + ret = ff_framesync_configure(&s->fs); + outlink->time_base = s->fs.time_base; + + return ret; } static int activate(AVFilterContext *ctx) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".