aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-12-02 19:44:09 +0100
committerStefano Sabatini <stefasab@gmail.com>2013-12-02 23:52:24 +0100
commitd5d51cf04dea45e518849e65c3ad274c9f31c017 (patch)
tree1184d02ba8562b7cfaf0042c118bf574d38a2894
parent830be99ae1679f852ef3bb7da427579008aa3887 (diff)
downloadffmpeg-d5d51cf04dea45e518849e65c3ad274c9f31c017.tar.gz
lavfi/volume: support all channel counts
-rw-r--r--libavfilter/af_volume.c4
1 files changed, 2 insertions, 2 deletions
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);