Merge commit '8eb57dc9d5ea13c12573e0759da0f7e79825af98'

[ffmpeg] / libavfilter / vsrc_life.c

diff --git a/libavfilter/vsrc_life.c b/libavfilter/vsrc_life.c
index 9410fbeb0f50a4e13c0633bf3004db25d5214972..47630add7d9e2c1650f2305b654c424feabac3fd 100644 (file)
--- a/libavfilter/vsrc_life.c
+++ b/libavfilter/vsrc_life.c
@@ -415,6 +415,8 @@ static int query_formats(AVFilterContext *ctx)
 {
     LifeContext *life = ctx->priv;
     enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_NONE, AV_PIX_FMT_NONE };
+    AVFilterFormats *fmts_list;
+
     if (life->mold || memcmp(life-> life_color, "\xff\xff\xff", 3)
                    || memcmp(life->death_color, "\x00\x00\x00", 3)) {
         pix_fmts[0] = AV_PIX_FMT_RGB24;
@@ -423,7 +425,11 @@ static int query_formats(AVFilterContext *ctx)
         pix_fmts[0] = AV_PIX_FMT_MONOBLACK;
         life->draw = fill_picture_monoblack;
     }
-    ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
+
+    fmts_list = ff_make_format_list(pix_fmts);
+    if (!fmts_list)
+        return AVERROR(ENOMEM);
+    ff_set_common_formats(ctx, fmts_list);
     return 0;
 }