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

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Jul  3 14:35:18 2019 +0200| [8a0636a93b388c241b26996bcb71a6c953dadd9b] | committer: Paul B Mahol

avfilter/vf_maskedmerge: use time_base from framesync

Fixes non-monotonous timestamps.

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

 libavfilter/vf_maskedmerge.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavfilter/vf_maskedmerge.c b/libavfilter/vf_maskedmerge.c
index 1a0250375e..30e0cd0f94 100644
--- a/libavfilter/vf_maskedmerge.c
+++ b/libavfilter/vf_maskedmerge.c
@@ -246,7 +246,6 @@ static int config_output(AVFilterLink *outlink)
 
     outlink->w = base->w;
     outlink->h = base->h;
-    outlink->time_base = base->time_base;
     outlink->sample_aspect_ratio = base->sample_aspect_ratio;
     outlink->frame_rate = base->frame_rate;
 
@@ -272,7 +271,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)