Showing the changes to libavfilter (2 of 2 files). Show all
Unified · Split
| @@ -350,6 +350,14 @@ static int config_output(AVFilterLink *outlink) · 349 unmodified lines | |||
| 350 | if ((ret = ff_framesync_configure(&s->fs)) < 0) | 350 | if ((ret = ff_framesync_configure(&s->fs)) < 0) |
| 351 | return ret; | 351 | return ret; |
| 352 | 352 | ||
| 353 | outlink->time_base = s->fs.time_base; | ||
| 354 | |||
| 355 | if (av_cmp_q(mainlink->time_base, outlink->time_base) && | ||
| 356 | av_cmp_q(ctx->inputs[1]->time_base, outlink->time_base)) | ||
| 357 | av_log(ctx, AV_LOG_WARNING, "not matching timebases found between first input: %d/%d and second input %d/%d, results may be incorrect!\n", | ||
| 358 | mainlink->time_base.num, mainlink->time_base.den, | ||
| 359 | ctx->inputs[1]->time_base.num, ctx->inputs[1]->time_base.den); | ||
| 360 | |||
| 353 | return 0; | 361 | return 0; |
| 354 | } | 362 | } |
| 355 | 363 | ||
| @@ -443,6 +443,14 @@ static int config_output(AVFilterLink *outlink) · 442 unmodified lines | |||
| 443 | if ((ret = ff_framesync_configure(&s->fs)) < 0) | 443 | if ((ret = ff_framesync_configure(&s->fs)) < 0) |
| 444 | return ret; | 444 | return ret; |
| 445 | 445 | ||
| 446 | outlink->time_base = s->fs.time_base; | ||
| 447 | |||
| 448 | if (av_cmp_q(mainlink->time_base, outlink->time_base) && | ||
| 449 | av_cmp_q(ctx->inputs[1]->time_base, outlink->time_base)) | ||
| 450 | av_log(ctx, AV_LOG_WARNING, "not matching timebases found between first input: %d/%d and second input %d/%d, results may be incorrect!\n", | ||
| 451 | mainlink->time_base.num, mainlink->time_base.den, | ||
| 452 | ctx->inputs[1]->time_base.num, ctx->inputs[1]->time_base.den); | ||
| 453 | |||
| 446 | return 0; | 454 | return 0; |
| 447 | } | 455 | } |
| 448 | 456 | ||