Merge commit '08377f9c3bf6dbe216512a2e05c9fac837b13fc0'

[ffmpeg] / libavfilter / af_amix.c

diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index 9a3cbd4dcd685dad7e1abe181c25278b4fda94e8..434dd907f6fac4424537e00c334281c3711e34b4 100644 (file)
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@@ -537,12 +537,13 @@ static int query_formats(AVFilterContext *ctx)
     int ret;
 
     layouts = ff_all_channel_layouts();
-
     if (!layouts)
         return AVERROR(ENOMEM);
 
-    ff_add_format(&formats, AV_SAMPLE_FMT_FLT);
-    ff_add_format(&formats, AV_SAMPLE_FMT_FLTP);
+    if ((ret = ff_add_format(&formats, AV_SAMPLE_FMT_FLT)) < 0)
+        return ret;
+    if ((ret = ff_add_format(&formats, AV_SAMPLE_FMT_FLTP)) < 0)
+        return ret;
     ret = ff_set_common_formats(ctx, formats);
     if (ret < 0)
         return ret;