History

avfilter/vf_colorkey: Use formats list instead of query func

Andreas Rheinhardt committed 5 years ago

Commit 5ee2bd61 parent 203889d1 file · +2 −7Browse files

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

Unified · Split

libavfilter/vf_colorkey.c+2−7
@@ -159,8 +159,6 @@ static av_cold int config_output(AVFilterLink *outlink) · 158 unmodified lines
159159 return 0;
160160 }
161161
162−static av_cold int query_formats(AVFilterContext *avctx)
163−{
164162 static const enum AVPixelFormat pixel_fmts[] = {
165163 AV_PIX_FMT_ARGB,
166164 AV_PIX_FMT_RGBA,
@@ -169,9 +167,6 @@ static av_cold int query_formats(AVFilterContext *avctx) · 2 unmodified lines
169167 AV_PIX_FMT_NONE
170168 };
171169
172− return ff_set_common_formats_from_list(avctx, pixel_fmts);
173−}
174−
175170 static const AVFilterPad colorkey_inputs[] = {
176171 {
177172 .name = "default",
@@ -211,7 +206,7 @@ const AVFilter ff_vf_colorkey = { · 33 unmodified lines
211206 .init = init_filter,
212207 FILTER_INPUTS(colorkey_inputs),
213208 FILTER_OUTPUTS(colorkey_outputs),
214− FILTER_QUERY_FUNC(query_formats),
209+ FILTER_PIXFMTS_ARRAY(pixel_fmts),
215210 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
216211 .process_command = ff_filter_process_command,
217212 };
@@ -236,7 +231,7 @@ const AVFilter ff_vf_colorhold = { · 18 unmodified lines
236231 .init = init_filter,
237232 FILTER_INPUTS(colorkey_inputs),
238233 FILTER_OUTPUTS(colorkey_outputs),
239− FILTER_QUERY_FUNC(query_formats),
234+ FILTER_PIXFMTS_ARRAY(pixel_fmts),
240235 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
241236 .process_command = ff_filter_process_command,
242237 };

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