virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avfilter/vf_stack: set framerate to VFR when inputs frame rates differs

Browse Source
This commit is contained in:
Paul B Mahol
2019-12-17 13:28:27 +01:00
parent 0f50be625f
commit 3530fdc78e
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavfilter/vf_stack.c
View File

@@ -310,6 +310,17 @@ static int config_output(AVFilterLink *outlink)
outlink->frame_rate = frame_rate; outlink->frame_rate = frame_rate;
outlink->sample_aspect_ratio = sar; outlink->sample_aspect_ratio = sar;
for (i = 1; i < s->nb_inputs; i++) {
AVFilterLink *inlink = ctx->inputs[i];
if (outlink->frame_rate.num != inlink->frame_rate.num ||
outlink->frame_rate.den != inlink->frame_rate.den) {
av_log(ctx, AV_LOG_VERBOSE,
"Video inputs have different frame rates, output will be VFR\n");
outlink->frame_rate = av_make_q(1, 0);
break;
}
}
if ((ret = ff_framesync_init(&s->fs, ctx, s->nb_inputs)) < 0) if ((ret = ff_framesync_init(&s->fs, ctx, s->nb_inputs)) < 0)
return ret; return ret;