[FFmpeg-devel] [PATCH 2/7] lavfi/avf_concat: return immediately after requesting a frame on input.

Nicolas George george at nsup.org
Sat Oct 24 19:02:44 CEST 2015


Signed-off-by: Nicolas George <george at nsup.org>
---
 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 5a4b356..4fa9447 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)
-- 
2.6.1



More information about the ffmpeg-devel mailing list