diff options
| author | Nicolas George <george@nsup.org> | 2015-09-24 10:07:42 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2015-12-22 16:04:30 +0100 |
| commit | 108b4de5529a75b06da72b974b26625a8067001f (patch) | |
| tree | c38c0fc0600038a55116cbc3246e8158c491df89 /libavfilter/f_interleave.c | |
| parent | 39a09e995d32d16e4f8c87a6ff5273cb9d98146e (diff) | |
lavfi: replace link.closed by link.status.
The status field can carry any error code instead of just EOF.
Also only update it through a wrapper function and provide a timestamp.
Update the few filters that used it directly.
Diffstat (limited to 'libavfilter/f_interleave.c')
| -rw-r--r-- | libavfilter/f_interleave.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/f_interleave.c b/libavfilter/f_interleave.c index e0915b56eb..422f2bfb29 100644 --- a/libavfilter/f_interleave.c +++ b/libavfilter/f_interleave.c @@ -59,7 +59,7 @@ inline static int push_frame(AVFilterContext *ctx) for (i = 0; i < ctx->nb_inputs; i++) { struct FFBufQueue *q = &s->queues[i]; - if (!q->available && !ctx->inputs[i]->closed) + if (!q->available && !ctx->inputs[i]->status) return 0; if (q->available) { frame = ff_bufqueue_peek(q, 0); @@ -190,7 +190,7 @@ static int request_frame(AVFilterLink *outlink) int i, ret; for (i = 0; i < ctx->nb_inputs; i++) { - if (!s->queues[i].available && !ctx->inputs[i]->closed) { + if (!s->queues[i].available && !ctx->inputs[i]->status) { ret = ff_request_frame(ctx->inputs[i]); if (ret != AVERROR_EOF) return ret; |