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

79c1be12 · Nicolas George · d92e0848 · 79c1be12
Commit 79c1be12 authored Oct 23, 2015 by Nicolas George
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

avf_concat.c libavfilter/avf_concat.c +2 -3

No files found.
--- 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)