Merge commit '7d8154edd594981e7891d57de91f2260f8a62939'

[ffmpeg] / libavfilter / vf_decimate.c

diff --git a/libavfilter/vf_decimate.c b/libavfilter/vf_decimate.c
index ffb9320c147f06742118678e7585a0dc4d9bc3b8..70357ea8e2981ef6c243e40694dd8a2d5d21682f 100644 (file)
--- a/libavfilter/vf_decimate.c
+++ b/libavfilter/vf_decimate.c
@@ -350,8 +350,10 @@ static int query_formats(AVFilterContext *ctx)
         AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16,
         AV_PIX_FMT_NONE
     };
-    ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
-    return 0;
+    AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
+    if (!fmts_list)
+        return AVERROR(ENOMEM);
+    return ff_set_common_formats(ctx, fmts_list);
 }
 
 static int config_output(AVFilterLink *outlink)