[FFmpeg-cvslog] avfilter/af_amix: Use av_mallocz_array()

Michael Niedermayer git at videolan.org
Sat Jun 7 15:11:09 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun  7 15:06:14 2014 +0200| [f2407407121f5439fc32b733c2ad9a2bd94e766a] | committer: Michael Niedermayer

avfilter/af_amix: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavfilter/af_amix.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index 7140b6c..1eef70d 100644
--- 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;



More information about the ffmpeg-cvslog mailing list