Browse Source

avfilter/vf_maskedmerge: use time_base from framesync

Fixes non-monotonous timestamps.
tags/n4.2
Paul B Mahol 6 years ago
parent
commit
8a0636a93b
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      libavfilter/vf_maskedmerge.c

+ 4
- 2
libavfilter/vf_maskedmerge.c View File

@@ -246,7 +246,6 @@ static int config_output(AVFilterLink *outlink)


outlink->w = base->w; outlink->w = base->w;
outlink->h = base->h; outlink->h = base->h;
outlink->time_base = base->time_base;
outlink->sample_aspect_ratio = base->sample_aspect_ratio; outlink->sample_aspect_ratio = base->sample_aspect_ratio;
outlink->frame_rate = base->frame_rate; outlink->frame_rate = base->frame_rate;


@@ -272,7 +271,10 @@ static int config_output(AVFilterLink *outlink)
s->fs.opaque = s; s->fs.opaque = s;
s->fs.on_event = process_frame; 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) static int activate(AVFilterContext *ctx)


Loading…
Cancel
Save