OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
830be99
)
lavfi/volume: support all channel counts
author
Stefano Sabatini
<stefasab@gmail.com>
Mon, 2 Dec 2013 18:44:09 +0000
(19:44 +0100)
committer
Stefano Sabatini
<stefasab@gmail.com>
Mon, 2 Dec 2013 22:52:24 +0000
(23:52 +0100)
libavfilter/af_volume.c
patch
|
blob
|
history
diff --git
a/libavfilter/af_volume.c
b/libavfilter/af_volume.c
index
cd24877
..
21fe9a1
100644
(file)
--- a/
libavfilter/af_volume.c
+++ b/
libavfilter/af_volume.c
@@
-101,7
+101,7
@@
static int query_formats(AVFilterContext *ctx)
}
};
- layouts = ff_all_channel_
layou
ts();
+ layouts = ff_all_channel_
coun
ts();
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);