virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avformat/movenc: use av_malloc(z)_array()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-08 15:19:46 +02:00
parent ee5145c05d
commit 7c3af60016
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/movenc.c
View File

@ -1381,7 +1381,7 @@ static int mov_write_ctts_tag(AVIOContext *pb, MOVTrack *track)
uint32_t atom_size; uint32_t atom_size;
int i; int i;
ctts_entries = av_malloc((track->entry + 1) * sizeof(*ctts_entries)); /* worst case */ ctts_entries = av_malloc_array((track->entry + 1), sizeof(*ctts_entries)); /* worst case */
ctts_entries[0].count = 1; ctts_entries[0].count = 1;
ctts_entries[0].duration = track->cluster[0].cts; ctts_entries[0].duration = track->cluster[0].cts;
for (i = 1; i < track->entry; i++) { for (i = 1; i < track->entry; i++) {
@ -1422,7 +1422,7 @@ static int mov_write_stts_tag(AVIOContext *pb, MOVTrack *track)
entries = 1; entries = 1;
} else { } else {
stts_entries = track->entry ? stts_entries = track->entry ?
av_malloc(track->entry * sizeof(*stts_entries)) : /* worst case */ av_malloc_array(track->entry, sizeof(*stts_entries)) : /* worst case */
NULL; NULL;
for (i = 0; i < track->entry; i++) { for (i = 0; i < track->entry; i++) {
int duration = get_cluster_duration(track, i); int duration = get_cluster_duration(track, i);
@ -3987,7 +3987,7 @@ static int mov_write_header(AVFormatContext *s)
// Reserve an extra stream for chapters for the case where chapters // Reserve an extra stream for chapters for the case where chapters
// are written in the trailer // are written in the trailer
mov->tracks = av_mallocz((mov->nb_streams + 1) * sizeof(*mov->tracks)); mov->tracks = av_mallocz_array((mov->nb_streams + 1), sizeof(*mov->tracks));
if (!mov->tracks) if (!mov->tracks)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);