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

avfilter/avf_concat: fix EOF timestamp

Browse Source
This commit is contained in:
Paul B Mahol 2021-07-25 20:09:44 +02:00
parent f2feb31b78
commit 51c22f6621
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/avf_concat.c
View File

@ -397,12 +397,17 @@ static int activate(AVFilterContext *ctx)
/* Forward status change */ /* Forward status change */
if (cat->cur_idx < ctx->nb_inputs) { if (cat->cur_idx < ctx->nb_inputs) {
for (i = 0; i < ctx->nb_outputs; i++) { for (i = 0; i < ctx->nb_outputs; i++) {
ret = ff_inlink_acknowledge_status(ctx->inputs[cat->cur_idx + i], &status, &pts); AVFilterLink *inlink = ctx->inputs[cat->cur_idx + i];
ret = ff_inlink_acknowledge_status(inlink, &status, &pts);
/* TODO use pts */ /* TODO use pts */
if (ret > 0) { if (ret > 0) {
close_input(ctx, cat->cur_idx + i); close_input(ctx, cat->cur_idx + i);
if (cat->cur_idx + ctx->nb_outputs >= ctx->nb_inputs) { if (cat->cur_idx + ctx->nb_outputs >= ctx->nb_inputs) {
ff_outlink_set_status(ctx->outputs[i], status, pts); int64_t eof_pts = cat->delta_ts;
eof_pts += av_rescale_q(pts, inlink->time_base, ctx->outputs[i]->time_base);
ff_outlink_set_status(ctx->outputs[i], status, eof_pts);
} }
if (!cat->nb_in_active) { if (!cat->nb_in_active) {
ret = flush_segment(ctx); ret = flush_segment(ctx);