virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avfilter/vf_maskedmerge: always use framesync timestamps

Browse Source
This commit is contained in:
Paul B Mahol 2019-07-14 17:38:26 +02:00
parent 3d78ad43f7
commit 74236f675e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/vf_maskedmerge.c
View File

@ -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);
} }