Browse Source

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

tags/n3.0
Nicolas George 9 years ago
parent
commit
79c1be124e
1 changed files with 2 additions and 3 deletions
  1. +2
    -3
      libavfilter/avf_concat.c

+ 2
- 3
libavfilter/avf_concat.c View File

@@ -347,10 +347,9 @@ static int request_frame(AVFilterLink *outlink)
if (cat->in[str].eof) if (cat->in[str].eof)
continue; continue;
ret = ff_request_frame(ctx->inputs[str]); 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; return ret;
close_input(ctx, str);
} }
ret = flush_segment(ctx); ret = flush_segment(ctx);
if (ret < 0) if (ret < 0)


Loading…
Cancel
Save