diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-27 12:28:23 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-10-05 18:01:02 +0200 |
commit | 20e3316584449dc9d0a3c784d450eb00b5627902 (patch) | |
tree | 97e7bf11db433e1d44f9d52ed650508d315904bc | |
parent | 063af69db46792f2297675e23a9b4de42d14ce8a (diff) | |
download | ffmpeg-20e3316584449dc9d0a3c784d450eb00b5627902.tar.gz |
avfilter/af_adelay: Use formats list instead of query function
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r-- | libavfilter/af_adelay.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c index e67f081b97..c42fa2d175 100644 --- a/libavfilter/af_adelay.c +++ b/libavfilter/af_adelay.c @@ -61,24 +61,6 @@ static const AVOption adelay_options[] = { AVFILTER_DEFINE_CLASS(adelay); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, - AV_SAMPLE_FMT_FLTP, 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); -} - #define DELAY(name, type, fill) \ static void delay_channel_## name ##p(ChanDelay *d, int nb_samples, \ const uint8_t *ssrc, uint8_t *ddst) \ @@ -344,6 +326,7 @@ const AVFilter ff_af_adelay = { .uninit = uninit, FILTER_INPUTS(adelay_inputs), FILTER_OUTPUTS(adelay_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, + AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; |