]> git.sesse.net Git - ffmpeg/commitdiff
avfilter/vf_stack: set framerate to VFR when inputs frame rates differs
authorPaul B Mahol <onemda@gmail.com>
Tue, 17 Dec 2019 12:28:27 +0000 (13:28 +0100)
committerPaul B Mahol <onemda@gmail.com>
Tue, 17 Dec 2019 12:30:16 +0000 (13:30 +0100)
libavfilter/vf_stack.c

index b9e87a4429ccc1e35354006e51e5eeb1bd0bb5ae..5bc4ccf6ed2715d13ee8e11db333dea8037782a9 100644 (file)
@@ -310,6 +310,17 @@ static int config_output(AVFilterLink *outlink)
     outlink->frame_rate = frame_rate;
     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)
         return ret;