af_amerge: return errors from subfilters when requesting a frame

5473a98e · Matthieu Bouron · Nicolas George · 27de7a8e · 5473a98e
Commit 5473a98e authored Apr 26, 2012 by Matthieu Bouron Committed by Nicolas George Apr 26, 2012
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

af_amerge.c libavfilter/af_amerge.c +3 -2

No files found.
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -141,11 +141,12 @@ static int request_frame(AVFilterLink *outlink)
 {
    AVFilterContext *ctx = outlink->src;
    AMergeContext *am = ctx->priv;
-    int i;
+    int i, ret;

    for (i = 0; i < 2; i++)
        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;
 }