diff --git a/libavfilter/vf_tonemap.c b/libavfilter/vf_tonemap.c
index 51f56c7386..363df8034b 100644
--- a/libavfilter/vf_tonemap.c
+++ b/libavfilter/vf_tonemap.c
@@ -71,17 +71,6 @@ typedef struct TonemapContext {
     const struct LumaCoefficients *coeffs;
 } TonemapContext;
 
-static const enum AVPixelFormat pix_fmts[] = {
-    AV_PIX_FMT_GBRPF32,
-    AV_PIX_FMT_GBRAPF32,
-    AV_PIX_FMT_NONE,
-};
-
-static int query_formats(AVFilterContext *ctx)
-{
-    return ff_set_common_formats_from_list(ctx, pix_fmts);
-}
-
 static av_cold int init(AVFilterContext *ctx)
 {
     TonemapContext *s = ctx->priv;
@@ -341,6 +330,6 @@ const AVFilter ff_vf_tonemap = {
     .priv_class      = &tonemap_class,
     FILTER_INPUTS(tonemap_inputs),
     FILTER_OUTPUTS(tonemap_outputs),
-    FILTER_QUERY_FUNC(query_formats),
+    FILTER_PIXFMTS(AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32),
     .flags           = AVFILTER_FLAG_SLICE_THREADS,
 };