avfilter/vf_hsvkey: Use formats list instead of query function

In this case it also allows to avoid a runtime check to which filter an AVFilterContext belongs to.

Andreas Rheinhardt committed 5 years ago

Commit a26efeb1 parent 253dc9b1 file · +3 −11Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

     return 0;
 }
-static av_cold int query_formats(AVFilterContext *avctx)
+static const enum AVPixelFormat key_pixel_fmts[] = {
-{
-    static const enum AVPixelFormat pixel_fmts[] = {
         AV_PIX_FMT_YUVA420P,
         AV_PIX_FMT_YUVA422P,
         AV_PIX_FMT_YUVA444P,
         AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16,
         AV_PIX_FMT_NONE
     };
-    const enum AVPixelFormat *pix_fmts;
-    pix_fmts = !strcmp(avctx->filter->name, "hsvhold") ? hold_pixel_fmts : pixel_fmts;
-    return ff_set_common_formats_from_list(avctx, pix_fmts);
-}
 static av_cold int config_input(AVFilterLink *inlink)
 {
     .priv_class    = &hsvkey_class,
     FILTER_INPUTS(hsvkey_inputs),
     FILTER_OUTPUTS(hsvkey_outputs),
-    FILTER_QUERY_FUNC(query_formats),
+    FILTER_PIXFMTS_ARRAY(key_pixel_fmts),
     .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
     .process_command = ff_filter_process_command,
 };
     .priv_class    = &hsvhold_class,
     FILTER_INPUTS(hsvhold_inputs),
     FILTER_OUTPUTS(hsvhold_outputs),
-    FILTER_QUERY_FUNC(query_formats),
+    FILTER_PIXFMTS_ARRAY(hold_pixel_fmts),
     .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
     .process_command = ff_filter_process_command,
 };

Keyboard shortcuts