History

avfilter/vf_lut3d: Use formats list instead of query function

Andreas Rheinhardt committed 5 years ago

Commit 25343861 parent 91b426d1 file · +3 −7Browse files

Unified · Split

libavfilter/vf_lut3d.c+3−7
@@ -1147,8 +1147,6 @@ static int set_identity_matrix(AVFilterContext *ctx, int size) · 1146 unmodified lines
11471147 return 0;
11481148 }
11491149
1150−static int query_formats(AVFilterContext *ctx)
1151−{
11521150 static const enum AVPixelFormat pix_fmts[] = {
11531151 AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
11541152 AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA,
@@ -1166,8 +1164,6 @@ static int query_formats(AVFilterContext *ctx) · 11 unmodified lines
11661164 AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32,
11671165 AV_PIX_FMT_NONE
11681166 };
1169− return ff_set_common_formats_from_list(ctx, pix_fmts);
1170−}
11711167
11721168 static int config_input(AVFilterLink *inlink)
11731169 {
@@ -1366,7 +1362,7 @@ const AVFilter ff_vf_lut3d = { · 192 unmodified lines
13661362 .uninit = lut3d_uninit,
13671363 FILTER_INPUTS(lut3d_inputs),
13681364 FILTER_OUTPUTS(lut3d_outputs),
1369− FILTER_QUERY_FUNC(query_formats),
1365+ FILTER_PIXFMTS_ARRAY(pix_fmts),
13701366 .priv_class = &lut3d_class,
13711367 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
13721368 .process_command = process_command,
@@ -1630,7 +1626,7 @@ const AVFilter ff_vf_haldclut = { · 257 unmodified lines
16301626 .activate = activate,
16311627 FILTER_INPUTS(haldclut_inputs),
16321628 FILTER_OUTPUTS(haldclut_outputs),
1633− FILTER_QUERY_FUNC(query_formats),
1629+ FILTER_PIXFMTS_ARRAY(pix_fmts),
16341630 .priv_class = &haldclut_class,
16351631 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS,
16361632 .process_command = process_command,
@@ -2293,7 +2289,7 @@ const AVFilter ff_vf_lut1d = { · 656 unmodified lines
22932289 .init = lut1d_init,
22942290 FILTER_INPUTS(lut1d_inputs),
22952291 FILTER_OUTPUTS(lut1d_outputs),
2296− FILTER_QUERY_FUNC(query_formats),
2292+ FILTER_PIXFMTS_ARRAY(pix_fmts),
22972293 .priv_class = &lut1d_class,
22982294 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
22992295 .process_command = lut1d_process_command,

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