summaryrefslogtreecommitdiff
path: root/tools/sidxindex.c
diff options
context:
space:
mode:
Diffstat (limited to 'tools/sidxindex.c')
-rw-r--r--tools/sidxindex.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/sidxindex.c b/tools/sidxindex.c
index e740a94b98..be284610d5 100644
--- a/tools/sidxindex.c
+++ b/tools/sidxindex.c
@@ -1,20 +1,20 @@
/*
* Copyright (c) 2014 Martin Storsjo
*
- * This file is part of Libav.
+ * This file is part of FFmpeg.
*
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -157,8 +157,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);
@@ -245,7 +245,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;