ffmpeg | branch: master | Paul B Mahol <one...@gmail.com> | Fri May 24 18:33:16 2019 +0200| [a9b5af0d19323f944ddf758a1d6823734bf97373] | committer: Paul B Mahol
avfilter/vf_mix: use time_base from framesync > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9b5af0d19323f944ddf758a1d6823734bf97373 --- libavfilter/vf_mix.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index 873bef9dc3..53f2059a91 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) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
