Unified · Split
| @@ -310,6 +310,17 @@ static int config_output(AVFilterLink *outlink) · 309 unmodified lines | |||
| 310 | outlink->frame_rate = frame_rate; | 310 | outlink->frame_rate = frame_rate; |
| 311 | outlink->sample_aspect_ratio = sar; | 311 | outlink->sample_aspect_ratio = sar; |
| 312 | 312 | ||
| 313 | for (i = 1; i < s->nb_inputs; i++) { | ||
| 314 | AVFilterLink *inlink = ctx->inputs[i]; | ||
| 315 | if (outlink->frame_rate.num != inlink->frame_rate.num || | ||
| 316 | outlink->frame_rate.den != inlink->frame_rate.den) { | ||
| 317 | av_log(ctx, AV_LOG_VERBOSE, | ||
| 318 | "Video inputs have different frame rates, output will be VFR\n"); | ||
| 319 | outlink->frame_rate = av_make_q(1, 0); | ||
| 320 | break; | ||
| 321 | } | ||
| 322 | } | ||
| 323 | |||
| 313 | if ((ret = ff_framesync_init(&s->fs, ctx, s->nb_inputs)) < 0) | 324 | if ((ret = ff_framesync_init(&s->fs, ctx, s->nb_inputs)) < 0) |
| 314 | return ret; | 325 | return ret; |
| 315 | 326 | ||