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 | 2f51b80f0fce6a2f6be3112e39bbd8064b1eb8ec (patch) | |
| tree | 9a2b40fd90093b82beab24e6fd2bf0333c9b9ef2 | |
| parent | 6176aee16e41239e391c22f982dffbbb23ccc0df (diff) | |
| download | ffmpeg-2f51b80f0fce6a2f6be3112e39bbd8064b1eb8ec.tar.gz | |
avfilter/af_astats: Use formats list instead of query function
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavfilter/af_astats.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c index d43dd086f1..0621d18b35 100644 --- a/libavfilter/af_astats.c +++ b/libavfilter/af_astats.c @@ -149,27 +149,6 @@ static const AVOption astats_options[] = { AVFILTER_DEFINE_CLASS(astats); -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, - AV_SAMPLE_FMT_S64, AV_SAMPLE_FMT_S64P, - AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, - 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 void reset_stats(AudioStatsContext *s) { int c; @@ -868,6 +847,10 @@ const AVFilter ff_af_astats = { .uninit = uninit, FILTER_INPUTS(astats_inputs), FILTER_OUTPUTS(astats_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, + AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, + AV_SAMPLE_FMT_S64, AV_SAMPLE_FMT_S64P, + AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_SLICE_THREADS, }; |