summaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_mix.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2019-05-24 18:33:16 +0200
committerPaul B Mahol <onemda@gmail.com>2019-05-24 18:33:16 +0200
commita9b5af0d19323f944ddf758a1d6823734bf97373 (patch)
treeb74ce7e1e75ff1a94db1f7ff8946172ba2876360 /libavfilter/vf_mix.c
parent1d74150a7dacf4912de21820ab1011b94c13eeb5 (diff)
downloadffmpeg-streaming-a9b5af0d19323f944ddf758a1d6823734bf97373.zip
ffmpeg-streaming-a9b5af0d19323f944ddf758a1d6823734bf97373.tar.gz
avfilter/vf_mix: use time_base from framesync
Diffstat (limited to 'libavfilter/vf_mix.c')
-rw-r--r--libavfilter/vf_mix.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c
index 873bef9..53f2059 100644
--- a/libavfilter/vf_mix.c
+++ b/libavfilter/vf_mix.c
@@ -217,7 +217,6 @@ static int config_output(AVFilterLink *outlink)
{
AVFilterContext *ctx = outlink->src;
MixContext *s = ctx->priv;
- AVRational time_base = ctx->inputs[0]->time_base;
AVRational frame_rate = ctx->inputs[0]->frame_rate;
AVFilterLink *inlink = ctx->inputs[0];
int height = ctx->inputs[0]->h;
@@ -252,7 +251,6 @@ static int config_output(AVFilterLink *outlink)
outlink->w = width;
outlink->h = height;
- outlink->time_base = time_base;
outlink->frame_rate = frame_rate;
if ((ret = ff_framesync_init(&s->fs, ctx, s->nb_inputs)) < 0)
@@ -271,7 +269,10 @@ static int config_output(AVFilterLink *outlink)
in[i].after = (s->duration == 1 || (s->duration == 2 && i == 0)) ? 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)
OpenPOWER on IntegriCloud