X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_mix.c;h=b5a282ad4ce0655fc82a9d6516e6dced29f1077b;hb=f6e942251c59239520da3e541dc2e0d785a94bad;hp=873bef9dc3c82d58848f9866916f22cfa3420034;hpb=39278ff0de5b5e3397c22538978bffbb38ee099b;p=ffmpeg diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index 873bef9dc3c..b5a282ad4ce 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -217,8 +217,8 @@ 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; + AVRational sar = ctx->inputs[0]->sample_aspect_ratio; AVFilterLink *inlink = ctx->inputs[0]; int height = ctx->inputs[0]->h; int width = ctx->inputs[0]->w; @@ -252,8 +252,8 @@ 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; if ((ret = ff_framesync_init(&s->fs, ctx, s->nb_inputs)) < 0) return ret; @@ -271,7 +271,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)