Signed-off-by: Paul B Mahol <one...@gmail.com> --- libavfilter/avf_concat.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index cb46f52a04..f7d3889dfa 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -397,12 +397,16 @@ static int activate(AVFilterContext *ctx) /* Forward status change */ if (cat->cur_idx < ctx->nb_inputs) { 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 */ if (ret > 0) { close_input(ctx, cat->cur_idx + i); if (cat->cur_idx + ctx->nb_outputs >= ctx->nb_inputs) { - ff_outlink_set_status(ctx->outputs[i], status, pts); + ff_outlink_set_status(ctx->outputs[i], status, + cat->delta_ts + av_rescale_q(pts, inlink->time_base, + ctx->outputs[i]->time_base)); } if (!cat->nb_in_active) { ret = flush_segment(ctx); -- 2.17.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".