[FFmpeg-cvslog] avcodec/proresenc_kostya: Use av_calloc/av_malloc_array()

Andreas Rheinhardt git at videolan.org
Fri Feb 11 21:01:18 EET 2022


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue Feb  8 11:33:00 2022 +0100| [fb36af3b66efab15b5a58f66acfd3425b06166dd] | committer: Andreas Rheinhardt

avcodec/proresenc_kostya: Use av_calloc/av_malloc_array()

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavcodec/proresenc_kostya.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c
index 08a874dd4e..beceee621d 100644
--- a/libavcodec/proresenc_kostya.c
+++ b/libavcodec/proresenc_kostya.c
@@ -1273,18 +1273,18 @@ static av_cold int encode_init(AVCodecContext *avctx)
             }
         }
 
-        ctx->slice_q = av_malloc(ctx->slices_per_picture * sizeof(*ctx->slice_q));
+        ctx->slice_q = av_malloc_array(ctx->slices_per_picture, sizeof(*ctx->slice_q));
         if (!ctx->slice_q)
             return AVERROR(ENOMEM);
 
-        ctx->tdata = av_mallocz(avctx->thread_count * sizeof(*ctx->tdata));
+        ctx->tdata = av_calloc(avctx->thread_count, sizeof(*ctx->tdata));
         if (!ctx->tdata)
             return AVERROR(ENOMEM);
 
         for (j = 0; j < avctx->thread_count; j++) {
-            ctx->tdata[j].nodes = av_malloc((ctx->slices_width + 1)
-                                            * TRELLIS_WIDTH
-                                            * sizeof(*ctx->tdata->nodes));
+            ctx->tdata[j].nodes = av_malloc_array(ctx->slices_width + 1,
+                                                  TRELLIS_WIDTH
+                                                  * sizeof(*ctx->tdata->nodes));
             if (!ctx->tdata[j].nodes)
                 return AVERROR(ENOMEM);
             for (i = min_quant; i < max_quant + 2; i++) {



More information about the ffmpeg-cvslog mailing list