X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Ff_interleave.c;h=b9192e9b144237ba872d83874b98fbb6b5ee9b7e;hb=c619a4e5259b6304475d889d0eae8ff661d518a7;hp=422f2bfb29bd5b1685708f512d55f4bf436f790d;hpb=190254f8810f8c9c40ce129add652a5120097b3b;p=ffmpeg diff --git a/libavfilter/f_interleave.c b/libavfilter/f_interleave.c index 422f2bfb29b..b9192e9b144 100644 --- a/libavfilter/f_interleave.c +++ b/libavfilter/f_interleave.c @@ -26,6 +26,10 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/opt.h" + +#define FF_INTERNAL_FIELDS 1 +#include "framequeue.h" + #include "avfilter.h" #include "bufferqueue.h" #include "formats.h" @@ -59,7 +63,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]->status) + if (!q->available && !ctx->inputs[i]->status_out) return 0; if (q->available) { frame = ff_bufqueue_peek(q, 0); @@ -190,7 +194,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]->status) { + if (!s->queues[i].available && !ctx->inputs[i]->status_out) { ret = ff_request_frame(ctx->inputs[i]); if (ret != AVERROR_EOF) return ret;