History

lavfi/vf_elbg: switch to query_func2()

Anton Khirnov committed 2 years ago

Commit 2161aba1 parent f59c1b81 file · +8 −6Browse files

Unified · Split

libavfilter/vf_elbg.c+8−6
@@ -85,9 +85,11 @@ static av_cold int init(AVFilterContext *ctx) · 84 unmodified lines
85 return 0;85 return 0;
86}86}
87 87
88static int query_formats(AVFilterContext *ctx)88static int query_formats(const AVFilterContext *ctx,
89 AVFilterFormatsConfig **cfg_in,
90 AVFilterFormatsConfig **cfg_out)
89{91{
90 ELBGFilterContext *const elbg = ctx->priv;92 const ELBGFilterContext *const elbg = ctx->priv;
91 int ret;93 int ret;
92 94
93 static const enum AVPixelFormat pix_fmts[] = {95 static const enum AVPixelFormat pix_fmts[] = {
@@ -96,14 +98,14 @@ static int query_formats(AVFilterContext *ctx) · 2 unmodified lines
96 AV_PIX_FMT_NONE98 AV_PIX_FMT_NONE
97 };99 };
98 if (!elbg->pal8) {100 if (!elbg->pal8) {
99 return ff_set_common_formats_from_list(ctx, pix_fmts);101 return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
100 } else {102 } else {
101 static const enum AVPixelFormat pal8_fmt[] = {103 static const enum AVPixelFormat pal8_fmt[] = {
102 AV_PIX_FMT_PAL8,104 AV_PIX_FMT_PAL8,
103 AV_PIX_FMT_NONE105 AV_PIX_FMT_NONE
104 };106 };
105 if ((ret = ff_formats_ref(ff_make_format_list(pix_fmts), &ctx->inputs[0]->outcfg.formats)) < 0 ||107 if ((ret = ff_formats_ref(ff_make_format_list(pix_fmts), &cfg_in[0]->formats)) < 0 ||
106 (ret = ff_formats_ref(ff_make_format_list(pal8_fmt), &ctx->outputs[0]->incfg.formats)) < 0)108 (ret = ff_formats_ref(ff_make_format_list(pal8_fmt), &cfg_out[0]->formats)) < 0)
107 return ret;109 return ret;
108 }110 }
109 return 0;111 return 0;
@@ -264,5 +266,5 @@ const AVFilter ff_vf_elbg = { · 154 unmodified lines
264 .uninit = uninit,266 .uninit = uninit,
265 FILTER_INPUTS(elbg_inputs),267 FILTER_INPUTS(elbg_inputs),
266 FILTER_OUTPUTS(ff_video_default_filterpad),268 FILTER_OUTPUTS(ff_video_default_filterpad),
267 FILTER_QUERY_FUNC(query_formats),269 FILTER_QUERY_FUNC2(query_formats),
268};270};

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