vsrc_cellauto: use AV_OPT_TYPE_IMAGE_SIZE.

[ffmpeg] / libavfilter / af_silencedetect.c

diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c
index 093ca2b21f67f48e31f1d67ec8ca53aefa8a27af..76001ce1d98e382779a16dfcaf69be78e5a5fee4 100644 (file)
--- a/libavfilter/af_silencedetect.c
+++ b/libavfilter/af_silencedetect.c
@@ -26,6 +26,7 @@
 #include "libavutil/opt.h"
 #include "libavutil/timestamp.h"
 #include "audio.h"
+#include "formats.h"
 #include "avfilter.h"
 
 typedef struct {
@@ -130,26 +131,26 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples)
 static int query_formats(AVFilterContext *ctx)
 {
     AVFilterFormats *formats = NULL;
+    AVFilterChannelLayouts *layouts = NULL;
     enum AVSampleFormat sample_fmts[] = {
         AV_SAMPLE_FMT_DBL,
         AV_SAMPLE_FMT_NONE
     };
-    int packing_fmts[] = { AVFILTER_PACKED, -1 };
 
-    formats = avfilter_make_all_channel_layouts();
-    if (!formats)
+    layouts = ff_all_channel_layouts();
+    if (!layouts)
         return AVERROR(ENOMEM);
-    avfilter_set_common_channel_layouts(ctx, formats);
+    ff_set_common_channel_layouts(ctx, layouts);
 
     formats = avfilter_make_format_list(sample_fmts);
     if (!formats)
         return AVERROR(ENOMEM);
     avfilter_set_common_sample_formats(ctx, formats);
 
-    formats = avfilter_make_format_list(packing_fmts);
+    formats = ff_all_samplerates();
     if (!formats)
         return AVERROR(ENOMEM);
-    avfilter_set_common_packing_formats(ctx, formats);
+    ff_set_common_samplerates(ctx, formats);
 
     return 0;
 }