Merge commit '8eb57dc9d5ea13c12573e0759da0f7e79825af98'

[ffmpeg] / libavfilter / af_adelay.c

diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c
index ef60f43727c9160373e784087bfb2de20bb4125f..ca141ce3b06932a54bd3ee26927778ae52f70db3 100644 (file)
--- a/libavfilter/af_adelay.c
+++ b/libavfilter/af_adelay.c
@@ -64,23 +64,26 @@ static int query_formats(AVFilterContext *ctx)
         AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP,
         AV_SAMPLE_FMT_NONE
     };
+    int ret;
 
     layouts = ff_all_channel_layouts();
     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;
 
     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);
 }
 
 #define DELAY(name, type, fill)                                           \