mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
avfilter/vf_maskedmerge: always use framesync timestamps
This commit is contained in:
parent
3d78ad43f7
commit
74236f675e
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user