lavfi: drop planar/packed negotiation support

[ffmpeg] / libavfilter / af_volume.c

diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c
index 99ae8b82fe03912d954e7438b6f920c59cc0468c..7c5188419539bfd10e2ee567eb9940d176202539 100644 (file)
--- a/libavfilter/af_volume.c
+++ b/libavfilter/af_volume.c
@@ -26,7 +26,9 @@
 
 #include "libavutil/audioconvert.h"
 #include "libavutil/eval.h"
+#include "audio.h"
 #include "avfilter.h"
+#include "formats.h"
 
 typedef struct {
     double volume;
@@ -80,6 +82,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
 static int query_formats(AVFilterContext *ctx)
 {
     AVFilterFormats *formats = NULL;
+    AVFilterChannelLayouts *layouts;
     enum AVSampleFormat sample_fmts[] = {
         AV_SAMPLE_FMT_U8,
         AV_SAMPLE_FMT_S16,
@@ -88,22 +91,21 @@ static int query_formats(AVFilterContext *ctx)
         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;
 }
@@ -167,7 +169,7 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples)
         }
         }
     }
-    avfilter_filter_samples(outlink, insamples);
+    ff_filter_samples(outlink, insamples);
 }
 
 AVFilter avfilter_af_volume = {