[FFmpeg-cvslog] avfilter/vf_displace: use time_base from framesync

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Jul 14 17:50:37 2019 +0200| [077bf9058f162414340b427dd467b7b8739874cd] | committer: Paul B Mahol

avfilter/vf_displace: use time_base from framesync

Fixes non-monotonous timestamps.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=077bf9058f162414340b427dd467b7b8739874cd
---

 libavfilter/vf_displace.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libavfilter/vf_displace.c b/libavfilter/vf_displace.c
index 768af6def4..e4c0330613 100644
--- a/libavfilter/vf_displace.c
+++ b/libavfilter/vf_displace.c
@@ -265,7 +265,7 @@ static int process_frame(FFFrameSync *fs)
 
         s->displace(s, in, xpic, ypic, out);
     }
-    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);
 }
@@ -332,7 +332,6 @@ static int config_output(AVFilterLink *outlink)
 
     outlink->w = srclink->w;
     outlink->h = srclink->h;
-    outlink->time_base = srclink->time_base;
     outlink->sample_aspect_ratio = srclink->sample_aspect_ratio;
     outlink->frame_rate = srclink->frame_rate;
 
@@ -356,7 +355,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)