Merge commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6'

[ffmpeg] / libavfilter / af_aphaser.c

diff --git a/libavfilter/af_aphaser.c b/libavfilter/af_aphaser.c
index 708b568c74f70095cadff21672ad8c088c085bab..b08570f90a87d0b5215d1950b410c5f5dd4521b9 100644 (file)
--- a/libavfilter/af_aphaser.c
+++ b/libavfilter/af_aphaser.c
@@ -94,23 +94,26 @@ static int query_formats(AVFilterContext *ctx)
         AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P,
         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 MOD(a, b) (((a) >= (b)) ? (a) - (b) : (a))