Merge commit '567ca142952c5be57e52c149c815dfe5d6ac6d41'

[ffmpeg] / libavfilter / af_ladspa.c

diff --git a/libavfilter/af_ladspa.c b/libavfilter/af_ladspa.c
index 890888096cec1b7c6864c2af2a0429fe120b3c30..c323d2d5d43c9c711a78f8c723f433f7bd16b206 100644 (file)
--- a/libavfilter/af_ladspa.c
+++ b/libavfilter/af_ladspa.c
@@ -597,22 +597,29 @@ static int query_formats(AVFilterContext *ctx)
     AVFilterChannelLayouts *layouts;
     static const enum AVSampleFormat sample_fmts[] = {
         AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE };
+    int ret;
 
     formats = ff_make_format_list(sample_fmts);
     if (!formats)
         return AVERROR(ENOMEM);
-    ff_set_common_formats(ctx, formats);
+    ret = ff_set_common_formats(ctx, formats);
+    if (ret < 0)
+        return ret;
 
     if (s->nb_inputs) {
         formats = ff_all_samplerates();
         if (!formats)
             return AVERROR(ENOMEM);
 
-        ff_set_common_samplerates(ctx, formats);
+        ret = ff_set_common_samplerates(ctx, formats);
+        if (ret < 0)
+            return ret;
     } else {
         int sample_rates[] = { s->sample_rate, -1 };
 
-        ff_set_common_samplerates(ctx, ff_make_format_list(sample_rates));
+        ret = ff_set_common_samplerates(ctx, ff_make_format_list(sample_rates));
+        if (ret < 0)
+            return ret;
     }
 
     if (s->nb_inputs == 1 && s->nb_outputs == 1) {
@@ -621,11 +628,17 @@ static int query_formats(AVFilterContext *ctx)
         if (!layouts)
             return AVERROR(ENOMEM);
 
-        ff_set_common_channel_layouts(ctx, layouts);
+        ret = ff_set_common_channel_layouts(ctx, layouts);
+        if (ret < 0)
+            return ret;
     } else if (s->nb_inputs == 2 && s->nb_outputs == 2) {
         layouts = NULL;
-        ff_add_channel_layout(&layouts, AV_CH_LAYOUT_STEREO);
-        ff_set_common_channel_layouts(ctx, layouts);
+        ret = ff_add_channel_layout(&layouts, AV_CH_LAYOUT_STEREO);
+        if (ret < 0)
+            return ret;
+        ret = ff_set_common_channel_layouts(ctx, layouts);
+        if (ret < 0)
+            return ret;
     } else {
         AVFilterLink *outlink = ctx->outputs[0];
 
@@ -634,19 +647,30 @@ static int query_formats(AVFilterContext *ctx)
             int64_t inlayout = FF_COUNT2LAYOUT(s->nb_inputs);
 
             layouts = NULL;
-            ff_add_channel_layout(&layouts, inlayout);
-            ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts);
-
-            if (!s->nb_outputs)
-                ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts);
+            ret = ff_add_channel_layout(&layouts, inlayout);
+            if (ret < 0)
+                return ret;
+            ret = ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts);
+            if (ret < 0)
+                return ret;
+
+            if (!s->nb_outputs) {
+                ret = ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts);
+                if (ret < 0)
+                    return ret;
+            }
         }
 
         if (s->nb_outputs >= 1) {
             int64_t outlayout = FF_COUNT2LAYOUT(s->nb_outputs);
 
             layouts = NULL;
-            ff_add_channel_layout(&layouts, outlayout);
-            ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts);
+            ret = ff_add_channel_layout(&layouts, outlayout);
+            if (ret < 0)
+                return ret;
+            ret = ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts);
+            if (ret < 0)
+                return ret;
         }
     }