[FFmpeg-cvslog] avcodec/g722enc: Use av_mallocz_array()

Michael Niedermayer git at videolan.org
Thu Jan 15 23:43:12 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 15 23:02:43 2015 +0100| [5989a2b24f36e559e1a61310c6b4935bb3dfb589] | committer: Michael Niedermayer

avcodec/g722enc: Use av_mallocz_array()

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

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

 libavcodec/g722enc.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c
index dac7c87..17dde9e 100644
--- a/libavcodec/g722enc.c
+++ b/libavcodec/g722enc.c
@@ -75,9 +75,9 @@ static av_cold int g722_encode_init(AVCodecContext * avctx)
         int max_paths = frontier * FREEZE_INTERVAL;
         int i;
         for (i = 0; i < 2; i++) {
-            c->paths[i] = av_mallocz(max_paths * sizeof(**c->paths));
-            c->node_buf[i] = av_mallocz(2 * frontier * sizeof(**c->node_buf));
-            c->nodep_buf[i] = av_mallocz(2 * frontier * sizeof(**c->nodep_buf));
+            c->paths[i] = av_mallocz_array(max_paths, sizeof(**c->paths));
+            c->node_buf[i] = av_mallocz_array(frontier, 2 * sizeof(**c->node_buf));
+            c->nodep_buf[i] = av_mallocz_array(frontier, 2 * sizeof(**c->nodep_buf));
             if (!c->paths[i] || !c->node_buf[i] || !c->nodep_buf[i]) {
                 ret = AVERROR(ENOMEM);
                 goto error;



More information about the ffmpeg-cvslog mailing list