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 | ade39d5b4ff722d27cf27a9f845fb9fb0bc8d868 (patch) | |
| tree | d7e88b776ab89e16a25d7083af777301ce5cea91 | |
| parent | d6bf86843d3302505764858c5a8f88a760c5ed0d (diff) | |
avfilter/af_amix: Use formats list instead of query function
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavfilter/af_amix.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index d2a363284f..3f51d43acd 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -589,22 +589,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->fdsp); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret; - - if ((ret = ff_set_common_formats_from_list(ctx, sample_fmts)) < 0 || - (ret = ff_set_common_all_samplerates(ctx)) < 0) - return ret; - - return ff_set_common_all_channel_counts(ctx); -} - static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, char *res, int res_len, int flags) { @@ -641,7 +625,8 @@ const AVFilter ff_af_amix = { .activate = activate, .inputs = NULL, FILTER_OUTPUTS(avfilter_af_amix_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP), .process_command = process_command, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, }; |