Merge commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6'

[ffmpeg] / libavfilter / vf_histogram.c

diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c
index 40ec40096f7db4e6def9a60c24fe831b3f8ed716..31004b71dbffe3389f3a39dd900ce87d26c57cd8 100644 (file)
--- a/libavfilter/vf_histogram.c
+++ b/libavfilter/vf_histogram.c
@@ -105,6 +105,7 @@ static int query_formats(AVFilterContext *ctx)
 {
     HistogramContext *h = ctx->priv;
     const enum AVPixelFormat *pix_fmts;
+    AVFilterFormats *fmts_list;
 
     switch (h->mode) {
     case MODE_WAVEFORM:
@@ -121,9 +122,10 @@ static int query_formats(AVFilterContext *ctx)
         av_assert0(0);
     }
 
-    ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
-
-    return 0;
+    fmts_list = ff_make_format_list(pix_fmts);
+    if (!fmts_list)
+        return AVERROR(ENOMEM);
+    return ff_set_common_formats(ctx, fmts_list);
 }
 
 static const uint8_t black_yuva_color[4] = { 0, 127, 127, 255 };