diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c
index cd248772e5..21fe9a15e0 100644
--- a/libavfilter/af_volume.c
+++ b/libavfilter/af_volume.c
@@ -101,7 +101,7 @@ static int query_formats(AVFilterContext *ctx)
         }
     };
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ff_set_common_channel_layouts(ctx, layouts);
@@ -206,7 +206,7 @@ static int config_output(AVFilterLink *outlink)
     AVFilterLink *inlink = ctx->inputs[0];
 
     vol->sample_fmt = inlink->format;
-    vol->channels   = av_get_channel_layout_nb_channels(inlink->channel_layout);
+    vol->channels   = inlink->channels;
     vol->planes     = av_sample_fmt_is_planar(inlink->format) ? vol->channels : 1;
 
     volume_init(vol);