diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-27 13:10:11 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-10-05 18:01:02 +0200 |
| commit | ba90e306c23738b77a1a50d4a3669240a4d4038f (patch) | |
| tree | 92b099ccab73275bbae32ff3f5bde3cfae544397 /libavfilter/af_afade.c | |
| parent | 8a4b76e9eeb0ae306989dbba07380b33989a63f8 (diff) | |
avfilter/af_afade: Use formats list instead of query function
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavfilter/af_afade.c')
| -rw-r--r-- | libavfilter/af_afade.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c index 16be1e050a..c57709050e 100644 --- a/libavfilter/af_afade.c +++ b/libavfilter/af_afade.c @@ -57,8 +57,6 @@ enum CurveType { NONE = -1, TRI, QSIN, ESIN, HSIN, LOG, IPAR, QUA, CUB, SQU, CBR #define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM #define TFLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM -static int query_formats(AVFilterContext *ctx) -{ static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, @@ -66,16 +64,6 @@ static int query_formats(AVFilterContext *ctx) AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE }; - int ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - ret = ff_set_common_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} static double fade_gain(int curve, int64_t index, int64_t range) { @@ -357,7 +345,7 @@ const AVFilter ff_af_afade = { .init = init, FILTER_INPUTS(avfilter_af_afade_inputs), FILTER_OUTPUTS(avfilter_af_afade_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), .priv_class = &afade_class, .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, @@ -631,7 +619,7 @@ const AVFilter ff_af_acrossfade = { .priv_class = &acrossfade_class, FILTER_INPUTS(avfilter_af_acrossfade_inputs), FILTER_OUTPUTS(avfilter_af_acrossfade_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), }; #endif /* CONFIG_ACROSSFADE_FILTER */ |