diff options
| author | Nicolas George <george@nsup.org> | 2015-10-23 12:36:17 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2015-11-07 16:43:36 +0100 |
| commit | 79c1be124e59575fa0dc2bc16eca07553e6758b4 (patch) | |
| tree | 2ffd565b41c26c1db53db21fd1fa5766d4c53e05 | |
| parent | d92e0848d9a5ad3c17253c13aaeada2817378609 (diff) | |
| download | ffmpeg-79c1be124e59575fa0dc2bc16eca07553e6758b4.tar.gz | |
lavfi/avf_concat: return immediately after requesting a frame on input.
| -rw-r--r-- | libavfilter/avf_concat.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 5a4b356ea8..4fa944766e 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) |