[FFmpeg-cvslog] avdevice/v4l2: Use av_malloc_array()

Michael Niedermayer git at videolan.org
Thu May 22 15:19:25 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 22 15:08:12 2014 +0200| [124c94a1c8dec7f2ba8c7a4a253bdb01cc494917] | committer: Michael Niedermayer

avdevice/v4l2: Use av_malloc_array()

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

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

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

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index bbd4892..64df0c7 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -351,12 +351,12 @@ static int mmap_init(AVFormatContext *ctx)
         return AVERROR(ENOMEM);
     }
     s->buffers = req.count;
-    s->buf_start = av_malloc(sizeof(void *) * s->buffers);
+    s->buf_start = av_malloc_array(s->buffers, sizeof(void *));
     if (s->buf_start == NULL) {
         av_log(ctx, AV_LOG_ERROR, "Cannot allocate buffer pointers\n");
         return AVERROR(ENOMEM);
     }
-    s->buf_len = av_malloc(sizeof(unsigned int) * s->buffers);
+    s->buf_len = av_malloc_array(s->buffers, sizeof(unsigned int));
     if (s->buf_len == NULL) {
         av_log(ctx, AV_LOG_ERROR, "Cannot allocate buffer sizes\n");
         av_free(s->buf_start);



More information about the ffmpeg-cvslog mailing list