[FFmpeg-cvslog] avcodec/tta: use av_malloc(z)_array()

Michael Niedermayer git at videolan.org
Fri Apr 18 15:56:16 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 18 15:19:09 2014 +0200| [bb0d9aedcbda268764cf7c41b07e24b3a05356f0] | committer: Michael Niedermayer

avcodec/tta: use av_malloc(z)_array()

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

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

 libavcodec/tta.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index 19cdd8c..87bfe7b 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -104,12 +104,12 @@ static int allocate_buffers(AVCodecContext *avctx)
     TTAContext *s = avctx->priv_data;
 
     if (s->bps < 3) {
-        s->decode_buffer = av_mallocz(sizeof(int32_t)*s->frame_length*s->channels);
+        s->decode_buffer = av_mallocz_array(sizeof(int32_t)*s->frame_length, s->channels);
         if (!s->decode_buffer)
             return AVERROR(ENOMEM);
     } else
         s->decode_buffer = NULL;
-    s->ch_ctx = av_malloc(avctx->channels * sizeof(*s->ch_ctx));
+    s->ch_ctx = av_malloc_array(avctx->channels, sizeof(*s->ch_ctx));
     if (!s->ch_ctx) {
         av_freep(&s->decode_buffer);
         return AVERROR(ENOMEM);



More information about the ffmpeg-cvslog mailing list