[FFmpeg-cvslog] lavfi/avf_concat: return immediately after requesting a frame on input.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <george at nsup.org> | Fri Oct 23 12:36:17 2015 +0200| [79c1be124e59575fa0dc2bc16eca07553e6758b4] | committer: Nicolas George

lavfi/avf_concat: return immediately after requesting a frame on input.

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

 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)