History

avfilter/vf_colorcontrast: Use formats list instead of query function

Andreas Rheinhardt committed 5 years ago

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

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

Unified · Split

libavfilter/vf_colorcontrast.c+1−6
@@ -310,8 +310,6 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) · 309 unmodified lines
310 return ff_filter_frame(ctx->outputs[0], frame);310 return ff_filter_frame(ctx->outputs[0], frame);
311}311}
312 312
313static av_cold int query_formats(AVFilterContext *ctx)
314{
315 static const enum AVPixelFormat pixel_fmts[] = {313 static const enum AVPixelFormat pixel_fmts[] = {
316 AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,314 AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
317 AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA,315 AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA,
@@ -327,9 +325,6 @@ static av_cold int query_formats(AVFilterContext *ctx) · 9 unmodified lines
327 AV_PIX_FMT_NONE325 AV_PIX_FMT_NONE
328 };326 };
329 327
330 return ff_set_common_formats_from_list(ctx, pixel_fmts);
331}
332
333static av_cold int config_input(AVFilterLink *inlink)328static av_cold int config_input(AVFilterLink *inlink)
334{329{
335 AVFilterContext *ctx = inlink->dst;330 AVFilterContext *ctx = inlink->dst;
@@ -394,7 +389,7 @@ const AVFilter ff_vf_colorcontrast = { · 58 unmodified lines
394 .priv_class = &colorcontrast_class,389 .priv_class = &colorcontrast_class,
395 FILTER_INPUTS(colorcontrast_inputs),390 FILTER_INPUTS(colorcontrast_inputs),
396 FILTER_OUTPUTS(colorcontrast_outputs),391 FILTER_OUTPUTS(colorcontrast_outputs),
397 FILTER_QUERY_FUNC(query_formats),392 FILTER_PIXFMTS_ARRAY(pixel_fmts),
398 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,393 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
399 .process_command = ff_filter_process_command,394 .process_command = ff_filter_process_command,
400};395};

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