RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi/f_select: switch to query_func2() 

Also, drop redundant calls that also happen implicitly in generic code.
This commit is contained in:
Anton Khirnov 2024-10-01 12:02:29 +02:00
parent 9e1184b122
commit a6f579544a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavfilter/f_select.c
View File

@ -515,13 +515,13 @@ const AVFilter ff_af_aselect = {
#if CONFIG_SELECT_FILTER #if CONFIG_SELECT_FILTER
static int query_formats(AVFilterContext *ctx) static int query_formats(const AVFilterContext *ctx,
AVFilterFormatsConfig **cfg_in,
AVFilterFormatsConfig **cfg_out)
{ {
SelectContext *select = ctx->priv; const SelectContext *select = ctx->priv;
if (!select->do_scene_detect) { if (select->do_scene_detect) {
return ff_default_query_formats(ctx);
} else {
static const enum AVPixelFormat pix_fmts[] = { static const enum AVPixelFormat pix_fmts[] = {
AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGBA,
AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA, AV_PIX_FMT_GRAY8, AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA, AV_PIX_FMT_GRAY8,
@ -530,8 +530,9 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV420P10,
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
return ff_set_common_formats_from_list(ctx, pix_fmts); return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
} }
return 0;
} }
DEFINE_OPTIONS(select, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM); DEFINE_OPTIONS(select, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM);
@ -564,7 +565,7 @@ const AVFilter ff_vf_select = {
.priv_size = sizeof(SelectContext), .priv_size = sizeof(SelectContext),
.priv_class = &select_class, .priv_class = &select_class,
FILTER_INPUTS(avfilter_vf_select_inputs), FILTER_INPUTS(avfilter_vf_select_inputs),
FILTER_QUERY_FUNC(query_formats), FILTER_QUERY_FUNC2(query_formats),
.flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS | AVFILTER_FLAG_METADATA_ONLY, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS | AVFILTER_FLAG_METADATA_ONLY,
}; };
#endif /* CONFIG_SELECT_FILTER */ #endif /* CONFIG_SELECT_FILTER */