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

Michael Niedermayer git at videolan.org
Tue Jan 13 00:17:26 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 12 23:14:40 2015 +0100| [13871a95d0e4af15b771040254079da908a34d6b] | committer: Michael Niedermayer

avcodec/snow: Use av_malloc_array()

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

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

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

diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 83db3c7..d5a620b 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -594,9 +594,9 @@ static int halfpel_interpol(SnowContext *s, uint8_t *halfpel[4][4], AVFrame *fra
         int ls= frame->linesize[p];
         uint8_t *src= frame->data[p];
 
-        halfpel[1][p] = (uint8_t*) av_malloc(ls * (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls);
-        halfpel[2][p] = (uint8_t*) av_malloc(ls * (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls);
-        halfpel[3][p] = (uint8_t*) av_malloc(ls * (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls);
+        halfpel[1][p] = (uint8_t*) av_malloc_array(ls, (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls);
+        halfpel[2][p] = (uint8_t*) av_malloc_array(ls, (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls);
+        halfpel[3][p] = (uint8_t*) av_malloc_array(ls, (h + 2 * EDGE_WIDTH)) + EDGE_WIDTH * (1 + ls);
         if (!halfpel[1][p] || !halfpel[2][p] || !halfpel[3][p])
             return AVERROR(ENOMEM);
 



More information about the ffmpeg-cvslog mailing list