diff options
| author | Paul B Mahol <onemda@gmail.com> | 2019-07-14 17:38:26 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2019-07-14 17:38:26 +0200 |
| commit | 74236f675eb4d4b7f8cdd953dca68ace3fee9757 (patch) | |
| tree | e7f701ec192372d3baa9d76defafd15cd5c5ec0b /libavfilter/vf_maskedmerge.c | |
| parent | 3d78ad43f781833207dd4a27ca4df0b61dbe7bb4 (diff) | |
| download | ffmpeg-74236f675eb4d4b7f8cdd953dca68ace3fee9757.tar.gz | |
avfilter/vf_maskedmerge: always use framesync timestamps
Diffstat (limited to 'libavfilter/vf_maskedmerge.c')
| -rw-r--r-- | libavfilter/vf_maskedmerge.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |