Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995'

[ffmpeg] / libavfilter / vf_drawbox.c

diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c
index 799d07ead4f4e75c4abe7dd3ff25c221b929dbd3..35a08e8f2e4afda3d9a5133e4ffd30dc32fb717b 100644 (file)
--- a/libavfilter/vf_drawbox.c
+++ b/libavfilter/vf_drawbox.c
@@ -112,9 +112,10 @@ static int query_formats(AVFilterContext *ctx)
         AV_PIX_FMT_YUV440P,  AV_PIX_FMT_YUVJ440P,
         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_input(AVFilterLink *inlink)