@@ -33,20 +33,6 @@ typedef struct VolDetectContext {
uint64_t histogram[0x10001];
} VolDetectContext;
-static int query_formats(AVFilterContext *ctx)
-{
- static const enum AVSampleFormat sample_fmts[] = {
- AV_SAMPLE_FMT_S16,
- AV_SAMPLE_FMT_S16P,
- AV_SAMPLE_FMT_NONE
- };
- int ret = ff_set_common_all_channel_counts(ctx);
- if (ret < 0)
- return ret;
-
- return ff_set_common_formats_from_list(ctx, sample_fmts);
-}
-
static int filter_frame(AVFilterLink *inlink, AVFrame *samples)
{
AVFilterContext *ctx = inlink->dst;
@@ -150,5 +136,5 @@ const AVFilter ff_af_volumedetect = {
.uninit = uninit,
FILTER_INPUTS(volumedetect_inputs),
FILTER_OUTPUTS(volumedetect_outputs),
- FILTER_QUERY_FUNC(query_formats),
+ FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P),
};
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavfilter/af_volumedetect.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)