[FFmpeg-cvslog] avfilter/vf_maskedmerge: always use framesync timestamps

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Jul 14 17:38:26 2019 +0200| [74236f675eb4d4b7f8cdd953dca68ace3fee9757] | committer: Paul B Mahol

avfilter/vf_maskedmerge: always use framesync timestamps

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

 libavfilter/vf_maskedmerge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/vf_maskedmerge.c b/libavfilter/vf_maskedmerge.c
index 30e0cd0f94..0c531935ef 100644
--- a/libavfilter/vf_maskedmerge.c
+++ b/libavfilter/vf_maskedmerge.c
@@ -136,7 +136,7 @@ static int process_frame(FFFrameSync *fs)
         ctx->internal->execute(ctx, filter_slice, &td, NULL,
                                FFMIN(s->height[2], ff_filter_get_nb_threads(ctx)));
     }
-    out->pts = av_rescale_q(base->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);
 }