[FFmpeg-cvslog] lavfi/volume: support all channel counts

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Mon Dec  2 19:44:09 2013 +0100| [d5d51cf04dea45e518849e65c3ad274c9f31c017] | committer: Stefano Sabatini

lavfi/volume: support all channel counts

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5d51cf04dea45e518849e65c3ad274c9f31c017
---

 libavfilter/af_volume.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c
index cd24877..21fe9a1 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);