[FFmpeg-cvslog] avfilter/avf_concat: fix EOF timestamp

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Jul 25 20:09:44 2021 +0200| [51c22f6621e57f2836048ec1779e2fe195786a9a] | committer: Paul B Mahol

avfilter/avf_concat: fix EOF timestamp

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=51c22f6621e57f2836048ec1779e2fe195786a9a
---

 libavfilter/avf_concat.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
index cb46f52a04..333a0b090c 100644
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@@ -397,12 +397,17 @@ 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);
+                    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) {
                     ret = flush_segment(ctx);