[FFmpeg-cvslog] af_amerge: return errors from subfilters when requesting a frame

[Matthieu Bouron]

ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at smartjog.com> | Thu Apr 26 17:43:00 2012 +0200| [5473a98e45aff6635a6f742518a33ef6565ba2c3] | committer: Nicolas George

af_amerge: return errors from subfilters when requesting a frame

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5473a98e45aff6635a6f742518a33ef6565ba2c3
---

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

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