[SCM] libav/experimental: Make avfilter_config_links() propagate the error code coming from the callee functions.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 69f73a89288229aa96730808a1445d340d9673ac
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Sun Oct 10 18:54:39 2010 +0000

    Make avfilter_config_links() propagate the error code coming from the
    callee functions.
    
    Originally committed as revision 25433 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index ea6f9fe..7005ff2 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -156,6 +156,7 @@ int avfilter_config_links(AVFilterContext *filter)
 {
     int (*config_link)(AVFilterLink *);
     unsigned i;
+    int ret;
 
     for (i = 0; i < filter->input_count; i ++) {
         AVFilterLink *link = filter->inputs[i];
@@ -171,17 +172,17 @@ int avfilter_config_links(AVFilterContext *filter)
         case AVLINK_UNINIT:
             link->init_state = AVLINK_STARTINIT;
 
-            if (avfilter_config_links(link->src))
-                return -1;
+            if ((ret = avfilter_config_links(link->src)) < 0)
+                return ret;
 
             if (!(config_link = link->srcpad->config_props))
                 config_link  = avfilter_default_config_output_link;
-            if (config_link(link))
-                return -1;
+            if ((ret = config_link(link)) < 0)
+                return ret;
 
             if ((config_link = link->dstpad->config_props))
-                if (config_link(link))
-                    return -1;
+                if ((ret = config_link(link)) < 0)
+                    return ret;
 
             link->init_state = AVLINK_INIT;
         }

-- 
Libav/FFmpeg packaging