Showing the changes to libavfilter/avfilter.c (1 of 1 file). Show all
Unified · Split
| @@ -427,19 +427,19 @@ int ff_request_frame(AVFilterLink *link) · 426 unmodified lines | |||
| 427 | return 0; | 427 | return 0; |
| 428 | } | 428 | } |
| 429 | 429 | ||
| 430 | static int64_t guess_status_pts(AVFilterContext *ctx, int status) | 430 | static int64_t guess_status_pts(AVFilterContext *ctx, int status, AVRational link_time_base) |
| 431 | { | 431 | { |
| 432 | unsigned i; | 432 | unsigned i; |
| 433 | int64_t r = INT64_MAX; | 433 | int64_t r = INT64_MAX; |
| 434 | 434 | ||
| 435 | for (i = 0; i < ctx->nb_inputs; i++) | 435 | for (i = 0; i < ctx->nb_inputs; i++) |
| 436 | if (ctx->inputs[i]->status_out == status) | 436 | if (ctx->inputs[i]->status_out == status) |
| 437 | r = FFMIN(r, ctx->inputs[i]->current_pts); | 437 | r = FFMIN(r, av_rescale_q(ctx->inputs[i]->current_pts, ctx->inputs[i]->time_base, link_time_base)); |
| 438 | if (r < INT64_MAX) | 438 | if (r < INT64_MAX) |
| 439 | return r; | 439 | return r; |
| 440 | av_log(ctx, AV_LOG_WARNING, "EOF timestamp not reliable\n"); | 440 | av_log(ctx, AV_LOG_WARNING, "EOF timestamp not reliable\n"); |
| 441 | for (i = 0; i < ctx->nb_inputs; i++) | 441 | for (i = 0; i < ctx->nb_inputs; i++) |
| 442 | r = FFMIN(r, ctx->inputs[i]->status_in_pts); | 442 | r = FFMIN(r, av_rescale_q(ctx->inputs[i]->status_in_pts, ctx->inputs[i]->time_base, link_time_base)); |
| 443 | if (r < INT64_MAX) | 443 | if (r < INT64_MAX) |
| 444 | return r; | 444 | return r; |
| 445 | return AV_NOPTS_VALUE; | 445 | return AV_NOPTS_VALUE; |
| @@ -458,7 +458,7 @@ static int ff_request_frame_to_filter(AVFilterLink *link) · 12 unmodified lines | |||
| 458 | ret = ff_request_frame(link->src->inputs[0]); | 458 | ret = ff_request_frame(link->src->inputs[0]); |
| 459 | if (ret < 0) { | 459 | if (ret < 0) { |
| 460 | if (ret != AVERROR(EAGAIN) && ret != link->status_in) | 460 | if (ret != AVERROR(EAGAIN) && ret != link->status_in) |
| 461 | ff_avfilter_link_set_in_status(link, ret, guess_status_pts(link->src, ret)); | 461 | ff_avfilter_link_set_in_status(link, ret, guess_status_pts(link->src, ret, link->time_base)); |
| 462 | if (ret == AVERROR_EOF) | 462 | if (ret == AVERROR_EOF) |
| 463 | ret = 0; | 463 | ret = 0; |
| 464 | } | 464 | } |