Commit 74236f67 authored by Paul B Mahol's avatar Paul B Mahol

avfilter/vf_maskedmerge: always use framesync timestamps

parent 3d78ad43
...@@ -136,7 +136,7 @@ static int process_frame(FFFrameSync *fs) ...@@ -136,7 +136,7 @@ static int process_frame(FFFrameSync *fs)
ctx->internal->execute(ctx, filter_slice, &td, NULL, ctx->internal->execute(ctx, filter_slice, &td, NULL,
FFMIN(s->height[2], ff_filter_get_nb_threads(ctx))); 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); return ff_filter_frame(outlink, out);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment