[FFmpeg-cvslog] tools/sidxindex: Use av_*malloc_array()

Michael Niedermayer git at videolan.org
Wed Apr 1 17:55:40 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  1 17:40:30 2015 +0200| [5b32558fd805c48035d6e0c23b4807c81286ee34] | committer: Michael Niedermayer

tools/sidxindex: Use av_*malloc_array()

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

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

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

diff --git a/tools/sidxindex.c b/tools/sidxindex.c
index e376428..504c595 100644
--- a/tools/sidxindex.c
+++ b/tools/sidxindex.c
@@ -156,8 +156,8 @@ static int handle_file(struct Tracks *tracks, const char *file)
             err = AVERROR(ENOMEM);
             goto fail;
         }
-        temp = av_realloc(tracks->tracks,
-                          sizeof(*tracks->tracks) * (tracks->nb_tracks + 1));
+        temp = av_realloc_array(tracks->tracks, tracks->nb_tracks + 1,
+                                sizeof(*tracks->tracks));
         if (!temp) {
             av_free(track);
             err = AVERROR(ENOMEM);
@@ -244,7 +244,7 @@ static int output_mpd(struct Tracks *tracks, const char *filename)
         nb_tracks = nb_tracks_buf;
         nb_sets = 2;
         for (i = 0; i < 2; i++) {
-            adaptation_sets[i] = av_malloc(sizeof(*adaptation_sets[i]) * tracks->nb_tracks);
+            adaptation_sets[i] = av_malloc_array(tracks->nb_tracks, sizeof(*adaptation_sets[i]));
             if (!adaptation_sets[i]) {
                 ret = AVERROR(ENOMEM);
                 goto err;



More information about the ffmpeg-cvslog mailing list