[FFmpeg-cvslog] ffmpeg: use av_malloc_array()

Michael Niedermayer git at videolan.org
Thu May 1 02:30:10 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 02:23:08 2014 +0200| [feaa31d35499395ec292015ce02e2a5494c8283e] | committer: Michael Niedermayer

ffmpeg: use av_malloc_array()

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

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

 ffmpeg.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index e7b4290..1237ba9 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2150,7 +2150,7 @@ static void print_sdp(void)
 {
     char sdp[16384];
     int i;
-    AVFormatContext **avc = av_malloc(sizeof(*avc) * nb_output_files);
+    AVFormatContext **avc = av_malloc_array(sizeof(*avc), nb_output_files);
 
     if (!avc)
         exit_program(1);
@@ -2285,7 +2285,7 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost,
         if (*p == ',')
             n++;
     size = n;
-    pts = av_malloc(sizeof(*pts) * size);
+    pts = av_malloc_array(sizeof(*pts), size);
     if (!pts) {
         av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n");
         exit_program(1);



More information about the ffmpeg-cvslog mailing list