diff options
author | Paul B Mahol <onemda@gmail.com> | 2019-07-03 14:35:18 +0200 |
---|---|---|
committer | Paul B Mahol <onemda@gmail.com> | 2019-07-03 14:54:05 +0200 |
commit | 8a0636a93b388c241b26996bcb71a6c953dadd9b (patch) | |
tree | 152cf4ac64f464acaef05c2e74928735d43b299f /libavfilter/vf_maskedmerge.c | |
parent | 9654e97572decb58d0effbfa8d0a0ede3cbe2d95 (diff) | |
download | ffmpeg-8a0636a93b388c241b26996bcb71a6c953dadd9b.tar.gz |
avfilter/vf_maskedmerge: use time_base from framesync
Fixes non-monotonous timestamps.
Diffstat (limited to 'libavfilter/vf_maskedmerge.c')
-rw-r--r-- | libavfilter/vf_maskedmerge.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavfilter/vf_maskedmerge.c b/libavfilter/vf_maskedmerge.c index 1a0250375e..30e0cd0f94 100644 --- a/libavfilter/vf_maskedmerge.c +++ b/libavfilter/vf_maskedmerge.c @@ -246,7 +246,6 @@ static int config_output(AVFilterLink *outlink) outlink->w = base->w; outlink->h = base->h; - outlink->time_base = base->time_base; outlink->sample_aspect_ratio = base->sample_aspect_ratio; outlink->frame_rate = base->frame_rate; @@ -272,7 +271,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) |