highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/f_interleave: no need to check for inlink eof if non-empty queue

Browse Source 
Also set state to ready if there is any inlink with queued frame.
This commit is contained in:
Paul B Mahol 2020-04-25 13:35:22 +02:00
parent ec3b5deab4
commit 35bcbfd6da
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/f_interleave.c
View File

@ -70,11 +70,9 @@ static int activate(AVFilterContext *ctx)
FF_FILTER_FORWARD_STATUS_BACK_ALL(outlink, ctx); FF_FILTER_FORWARD_STATUS_BACK_ALL(outlink, ctx);
for (i = 0; i < ctx->nb_inputs; i++) { for (i = 0; i < ctx->nb_inputs; i++) {
if (!ff_outlink_get_status(ctx->inputs[i])) { if (!ff_inlink_queued_frames(ctx->inputs[i]))
if (!ff_inlink_queued_frames(ctx->inputs[i])) continue;
break; nb_inputs_with_frames++;
nb_inputs_with_frames++;
}
} }
if (nb_inputs_with_frames > 0) { if (nb_inputs_with_frames > 0) {
@ -137,6 +135,11 @@ static int activate(AVFilterContext *ctx)
} }
} }
if (i) {
ff_filter_set_ready(ctx, 100);
return 0;
}
return FFERROR_NOT_READY; return FFERROR_NOT_READY;
} }