History

avfilter/vf_curves: Use formats list instead of query function

Andreas Rheinhardt committed 5 years ago

Commit c3557051 parent e6d233e1 file · +13 −22Browse files

Unified · Split

libavfilter/vf_curves.c+13−22
@@ -513,27 +513,6 @@ static av_cold int curves_init(AVFilterContext *ctx) · 512 unmodified lines
513513 return 0;
514514 }
515515
516−static int query_formats(AVFilterContext *ctx)
517−{
518− static const enum AVPixelFormat pix_fmts[] = {
519− AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
520− AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA,
521− AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR,
522− AV_PIX_FMT_0RGB, AV_PIX_FMT_0BGR,
523− AV_PIX_FMT_RGB0, AV_PIX_FMT_BGR0,
524− AV_PIX_FMT_RGB48, AV_PIX_FMT_BGR48,
525− AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64,
526− AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP,
527− AV_PIX_FMT_GBRP9,
528− AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRAP10,
529− AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRAP12,
530− AV_PIX_FMT_GBRP14,
531− AV_PIX_FMT_GBRP16, AV_PIX_FMT_GBRAP16,
532− AV_PIX_FMT_NONE
533− };
534− return ff_set_common_formats_from_list(ctx, pix_fmts);
535−}
536−
537516 static int filter_slice_packed(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
538517 {
539518 int x, y;
@@ -817,7 +796,19 @@ const AVFilter ff_vf_curves = { · 277 unmodified lines
817796 .uninit = curves_uninit,
818797 FILTER_INPUTS(curves_inputs),
819798 FILTER_OUTPUTS(curves_outputs),
820− FILTER_QUERY_FUNC(query_formats),
799+ FILTER_PIXFMTS(AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
800+ AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA,
801+ AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR,
802+ AV_PIX_FMT_0RGB, AV_PIX_FMT_0BGR,
803+ AV_PIX_FMT_RGB0, AV_PIX_FMT_BGR0,
804+ AV_PIX_FMT_RGB48, AV_PIX_FMT_BGR48,
805+ AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64,
806+ AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP,
807+ AV_PIX_FMT_GBRP9,
808+ AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRAP10,
809+ AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRAP12,
810+ AV_PIX_FMT_GBRP14,
811+ AV_PIX_FMT_GBRP16, AV_PIX_FMT_GBRAP16),
821812 .priv_class = &curves_class,
822813 .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
823814 .process_command = 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