History

avfilter/vf_colorchannelmixer: Use formats list instead of query func

Andreas Rheinhardt committed 5 years ago

Commit 6d5d8be1 parent 112b6cf1 file · +1 −6Browse files

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

Unified · Split

libavfilter/vf_colorchannelmixer.c+1−6
@@ -90,8 +90,6 @@ static const AVOption colorchannelmixer_options[] = { · 89 unmodified lines
9090
9191 AVFILTER_DEFINE_CLASS(colorchannelmixer);
9292
93−static int query_formats(AVFilterContext *ctx)
94−{
9593 static const enum AVPixelFormat pix_fmts[] = {
9694 AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
9795 AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA,
@@ -109,9 +107,6 @@ static int query_formats(AVFilterContext *ctx) · 11 unmodified lines
109107 AV_PIX_FMT_NONE
110108 };
111109
112− return ff_set_common_formats_from_list(ctx, pix_fmts);
113−}
114−
115110 static float lerpf(float v0, float v1, float f)
116111 {
117112 return v0 + (v1 - v0) * f;
@@ -782,7 +777,7 @@ const AVFilter ff_vf_colorchannelmixer = { · 664 unmodified lines
782777 .uninit = uninit,
783778 FILTER_INPUTS(colorchannelmixer_inputs),
784779 FILTER_OUTPUTS(colorchannelmixer_outputs),
785− FILTER_QUERY_FUNC(query_formats),
780+ FILTER_PIXFMTS_ARRAY(pix_fmts),
786781 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
787782 .process_command = process_command,
788783 };

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