projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
a62814a
)
avfilter/af_amix: Use av_mallocz_array()
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 7 Jun 2014 13:06:14 +0000
(15:06 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 7 Jun 2014 13:06:14 +0000
(15:06 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_amix.c
patch
|
blob
|
history
diff --git
a/libavfilter/af_amix.c
b/libavfilter/af_amix.c
index
7140b6c
..
1eef70d
100644
(file)
--- a/
libavfilter/af_amix.c
+++ b/
libavfilter/af_amix.c
@@
-249,7
+249,7
@@
static int config_output(AVFilterLink *outlink)
memset(s->input_state, INPUT_ON, s->nb_inputs);
s->active_inputs = s->nb_inputs;
- s->input_scale = av_mallocz
(s->nb_inputs *
sizeof(*s->input_scale));
+ s->input_scale = av_mallocz
_array(s->nb_inputs,
sizeof(*s->input_scale));
if (!s->input_scale)
return AVERROR(ENOMEM);
s->scale_norm = s->active_inputs;