X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_displace.c;h=9c310e17400c8fb843a5b8a5af288b20ed8bd586;hb=a04ad248a05e7b613abe09b3bb067f555108d794;hp=768af6def478df448c7a028c55421b8f2280cb4e;hpb=06476249cd2332e30b66576633b2827adf3478dd;p=ffmpeg diff --git a/libavfilter/vf_displace.c b/libavfilter/vf_displace.c index 768af6def47..9c310e17400 100644 --- a/libavfilter/vf_displace.c +++ b/libavfilter/vf_displace.c @@ -265,7 +265,7 @@ static int process_frame(FFFrameSync *fs) s->displace(s, in, xpic, ypic, out); } - out->pts = av_rescale_q(in->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); } @@ -332,7 +332,6 @@ static int config_output(AVFilterLink *outlink) outlink->w = srclink->w; outlink->h = srclink->h; - outlink->time_base = srclink->time_base; outlink->sample_aspect_ratio = srclink->sample_aspect_ratio; outlink->frame_rate = srclink->frame_rate; @@ -356,7 +355,10 @@ static int config_output(AVFilterLink *outlink) s->fs.opaque = s; s->fs.on_event = process_frame; - return ff_framesync_configure(&s->fs); + ret = ff_framesync_configure(&s->fs); + outlink->time_base = s->fs.time_base; + + return ret; } static int activate(AVFilterContext *ctx) @@ -398,7 +400,7 @@ static const AVFilterPad displace_outputs[] = { { NULL } }; -AVFilter ff_vf_displace = { +const AVFilter ff_vf_displace = { .name = "displace", .description = NULL_IF_CONFIG_SMALL("Displace pixels."), .priv_size = sizeof(DisplaceContext),