History

avfilter/af_contrast: Use formats list instead of query function

Andreas Rheinhardt committed 5 years ago

Commit e61393d1 parent b4f52011 file · +2 −21Browse files

Unified · Split

libavfilter/af_acontrast.c+2−21
@@ -42,26 +42,6 @@ static const AVOption acontrast_options[] = { · 41 unmodified lines
4242
4343 AVFILTER_DEFINE_CLASS(acontrast);
4444
45−static int query_formats(AVFilterContext *ctx)
46−{
47− static const enum AVSampleFormat sample_fmts[] = {
48− AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP,
49− AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP,
50− AV_SAMPLE_FMT_NONE
51− };
52− int ret;
53−
54− ret = ff_set_common_formats_from_list(ctx, sample_fmts);
55− if (ret < 0)
56− return ret;
57−
58− ret = ff_set_common_all_channel_counts(ctx);
59− if (ret < 0)
60− return ret;
61−
62− return ff_set_common_all_samplerates(ctx);
63−}
64−
6545 static void filter_flt(void **d, const void **s,
6646 int nb_samples, int channels,
6747 float contrast)
@@ -203,5 +183,6 @@ const AVFilter ff_af_acontrast = { · 135 unmodified lines
203183 .priv_class = &acontrast_class,
204184 FILTER_INPUTS(inputs),
205185 FILTER_OUTPUTS(outputs),
206− FILTER_QUERY_FUNC(query_formats),
186+ FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP,
187+ AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP),
207188 };

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