History

lavfi/vf_geq: switch to query_func2()

Anton Khirnov committed 2 years ago

Commit e0eec711 parent a81061b1 file · +6 −4Browse files

Unified · Split

libavfilter/vf_geq.c+6−4
@@ -336,9 +336,11 @@ end: · 335 unmodified lines
336336 return ret;
337337 }
338338
339−static int geq_query_formats(AVFilterContext *ctx)
339+static int geq_query_formats(const AVFilterContext *ctx,
340+ AVFilterFormatsConfig **cfg_in,
341+ AVFilterFormatsConfig **cfg_out)
340342 {
341− GEQContext *geq = ctx->priv;
343+ const GEQContext *geq = ctx->priv;
342344 static const enum AVPixelFormat yuv_pix_fmts[] = {
343345 AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P,
344346 AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV440P,
@@ -371,7 +373,7 @@ static int geq_query_formats(AVFilterContext *ctx) · 26 unmodified lines
371373 };
372374 const enum AVPixelFormat *pix_fmts = geq->is_rgb ? rgb_pix_fmts : yuv_pix_fmts;
373375
374− return ff_set_common_formats_from_list(ctx, pix_fmts);
376+ return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
375377 }
376378
377379 static int geq_config_props(AVFilterLink *inlink)
@@ -532,7 +534,7 @@ const AVFilter ff_vf_geq = { · 154 unmodified lines
532534 .uninit = geq_uninit,
533535 FILTER_INPUTS(geq_inputs),
534536 FILTER_OUTPUTS(ff_video_default_filterpad),
535− FILTER_QUERY_FUNC(geq_query_formats),
537+ FILTER_QUERY_FUNC2(geq_query_formats),
536538 .priv_class = &geq_class,
537539 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
538540 };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t