summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2019-04-25 21:14:48 +0200
committerPaul B Mahol <onemda@gmail.com>2019-04-26 23:59:52 +0200
commitbf15dcc5c8d8172282da2abcc93fef61174fffdf (patch)
treebd2ee08464e0a5f88afb22781294b7d59393e38e
parentf857753f56f86046d454969e33ba85b3bac99be2 (diff)
avfilter/vf_stack: use time_base from framesync
Fixes non-monotonous timestamps.
-rw-r--r--libavfilter/vf_stack.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavfilter/vf_stack.c b/libavfilter/vf_stack.c
index 8731674aa7..b836d96bf0 100644
--- a/libavfilter/vf_stack.c
+++ b/libavfilter/vf_stack.c
@@ -174,7 +174,6 @@ static int config_output(AVFilterLink *outlink)
{
AVFilterContext *ctx = outlink->src;
StackContext *s = ctx->priv;
- AVRational time_base = ctx->inputs[0]->time_base;
AVRational frame_rate = ctx->inputs[0]->frame_rate;
AVRational sar = ctx->inputs[0]->sample_aspect_ratio;
int height = ctx->inputs[0]->h;
@@ -281,7 +280,6 @@ static int config_output(AVFilterLink *outlink)
outlink->w = width;
outlink->h = height;
- outlink->time_base = time_base;
outlink->frame_rate = frame_rate;
outlink->sample_aspect_ratio = sar;
@@ -301,7 +299,10 @@ static int config_output(AVFilterLink *outlink)
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)