Skip to content

F
ffmpeg.wasm-core
Commit 5473a98e authored by Matthieu Bouron's avatar Matthieu Bouron Committed by Nicolas George
Browse files
Options

af_amerge: return errors from subfilters when requesting a frame

parent 27de7a8e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
libavfilter/af_amerge.c
View file @ 5473a98e
...@@ -141,11 +141,12 @@ static int request_frame(AVFilterLink *outlink) ...@@ -141,11 +141,12 @@ static int request_frame(AVFilterLink *outlink)
{ {
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
AMergeContext *am = ctx->priv; AMergeContext *am = ctx->priv;
int i; int i, ret;
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
if (!am->queue[i].nb_samples) if (!am->queue[i].nb_samples)
avfilter_request_frame(ctx->inputs[i]); if ((ret = avfilter_request_frame(ctx->inputs[i])) < 0)
return ret;
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment