From 5473a98e45aff6635a6f742518a33ef6565ba2c3 Mon Sep 17 00:00:00 2001
From: Matthieu Bouron <matthieu.bouron@smartjog.com>
Date: Thu, 26 Apr 2012 17:43:00 +0200
Subject: [PATCH] af_amerge: return errors from subfilters when requesting a
 frame

---
 libavfilter/af_amerge.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index c9b0f21fd1..a160391a57 100644
--- 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;
 }