From 79c1be124e59575fa0dc2bc16eca07553e6758b4 Mon Sep 17 00:00:00 2001
From: Nicolas George <george@nsup.org>
Date: Fri, 23 Oct 2015 12:36:17 +0200
Subject: [PATCH] lavfi/avf_concat: return immediately after requesting a frame
on input.
---
libavfilter/avf_concat.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
index 5a4b356ea85..4fa944766e7 100644
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@@ -347,10 +347,9 @@ static int request_frame(AVFilterLink *outlink)
if (cat->in[str].eof)
continue;
ret = ff_request_frame(ctx->inputs[str]);
- if (ret == AVERROR_EOF)
- close_input(ctx, str);
- else if (ret < 0)
+ if (ret != AVERROR_EOF)
return ret;
+ close_input(ctx, str);
}
ret = flush_segment(ctx);
if (ret < 0)
--
GitLab