Merge commit '8a66fd40260b7aae6226d68c4dbad43b05a8e524'

[ffmpeg] / libavfilter / af_bs2b.c

diff --git a/libavfilter/af_bs2b.c b/libavfilter/af_bs2b.c
index 3dd0bcd99a2a54bda54dc8d9ab7ce646c112288a..592fdec3d76dd9cd19d7426332bb068c5369021e 100644 (file)
--- a/libavfilter/af_bs2b.c
+++ b/libavfilter/af_bs2b.c
@@ -106,22 +106,25 @@ static int query_formats(AVFilterContext *ctx)
         AV_SAMPLE_FMT_DBL,
         AV_SAMPLE_FMT_NONE,
     };
+    int ret;
 
     if (ff_add_channel_layout(&layouts, AV_CH_LAYOUT_STEREO) != 0)
         return AVERROR(ENOMEM);
-    ff_set_common_channel_layouts(ctx, layouts);
+    ret = ff_set_common_channel_layouts(ctx, layouts);
+    if (ret < 0)
+        return 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;
 
     formats = ff_all_samplerates();
     if (!formats)
         return AVERROR(ENOMEM);
-    ff_set_common_samplerates(ctx, formats);
-
-    return 0;
+    return ff_set_common_samplerates(ctx, formats);
 }
 
 static int filter_frame(AVFilterLink *inlink, AVFrame *frame)