RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_displace: use time_base from framesync 

Fixes non-monotonous timestamps.
This commit is contained in:
Paul B Mahol 2019-07-14 17:50:37 +02:00
parent 8788dd67b8
commit 077bf9058f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_displace.c
View File

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