Merge commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd'

[ffmpeg] / libavfilter / vf_histeq.c

diff --git a/libavfilter/vf_histeq.c b/libavfilter/vf_histeq.c
index 6fdb7be231321fc4cb8d9872a4a8025d95d59f2d..ce28afdad659fb3cb91797b0bb5643d252945494 100644 (file)
--- a/libavfilter/vf_histeq.c
+++ b/libavfilter/vf_histeq.c
@@ -57,7 +57,7 @@ typedef struct {
     const AVClass *class;
     float strength;
     float intensity;
-    enum HisteqAntibanding antibanding;
+    int antibanding;               ///< HisteqAntibanding
     int in_histogram [256];        ///< input histogram
     int out_histogram[256];        ///< output histogram
     int LUT[256];                  ///< lookup table derived from histogram[]
@@ -94,14 +94,15 @@ static av_cold int init(AVFilterContext *ctx)
 
 static int query_formats(AVFilterContext *ctx)
 {
-    static const enum PixelFormat pix_fmts[] = {
+    static const enum AVPixelFormat pix_fmts[] = {
         AV_PIX_FMT_ARGB, AV_PIX_FMT_RGBA, AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA,
         AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
         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)