Browse Source

avfilter/vf_stack: use time_base from framesync

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

+ 4
- 3
libavfilter/vf_stack.c View File

@@ -174,7 +174,6 @@ static int config_output(AVFilterLink *outlink)
{ {
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
StackContext *s = ctx->priv; StackContext *s = ctx->priv;
AVRational time_base = ctx->inputs[0]->time_base;
AVRational frame_rate = ctx->inputs[0]->frame_rate; AVRational frame_rate = ctx->inputs[0]->frame_rate;
AVRational sar = ctx->inputs[0]->sample_aspect_ratio; AVRational sar = ctx->inputs[0]->sample_aspect_ratio;
int height = ctx->inputs[0]->h; int height = ctx->inputs[0]->h;
@@ -281,7 +280,6 @@ static int config_output(AVFilterLink *outlink)


outlink->w = width; outlink->w = width;
outlink->h = height; outlink->h = height;
outlink->time_base = time_base;
outlink->frame_rate = frame_rate; outlink->frame_rate = frame_rate;
outlink->sample_aspect_ratio = sar; outlink->sample_aspect_ratio = sar;


@@ -301,7 +299,10 @@ static int config_output(AVFilterLink *outlink)
in[i].after = s->shortest ? EXT_STOP : EXT_INFINITY; in[i].after = s->shortest ? EXT_STOP : EXT_INFINITY;
} }


return ff_framesync_configure(&s->fs);
ret = ff_framesync_configure(&s->fs);
outlink->time_base = s->fs.time_base;

return ret;
} }


static av_cold void uninit(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx)


Loading…
Cancel
Save