diff options
Diffstat (limited to 'tools/ismindex.c')
| -rw-r--r-- | tools/ismindex.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/tools/ismindex.c b/tools/ismindex.c index f3bfec0a96..8636c966e8 100644 --- a/tools/ismindex.c +++ b/tools/ismindex.c @@ -1,26 +1,26 @@ /* * Copyright (c) 2012 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 */ /* * To create a simple file for smooth streaming: - * avconv <normal input/transcoding options> -movflags frag_keyframe foo.ismv + * ffmpeg <normal input/transcoding options> -movflags frag_keyframe foo.ismv * ismindex -n foo foo.ismv * This step creates foo.ism and foo.ismc that is required by IIS for * serving it. @@ -47,6 +47,8 @@ #include <stdio.h> #include <string.h> +#include "cmdutils.h" + #include "libavformat/avformat.h" #include "libavformat/isom.h" #include "libavformat/os_support.h" @@ -342,8 +344,9 @@ static int read_tfra(struct Tracks *tracks, int start_index, AVIOContext *f) } fieldlength = avio_rb32(f); track->chunks = avio_rb32(f); - track->offsets = av_mallocz(sizeof(*track->offsets) * track->chunks); + track->offsets = av_mallocz_array(track->chunks, sizeof(*track->offsets)); if (!track->offsets) { + track->chunks = 0; ret = AVERROR(ENOMEM); goto fail; } @@ -452,10 +455,11 @@ fail: static int get_private_data(struct Track *track, AVCodecContext *codec) { - track->codec_private_size = codec->extradata_size; + track->codec_private_size = 0; track->codec_private = av_mallocz(codec->extradata_size); if (!track->codec_private) return AVERROR(ENOMEM); + track->codec_private_size = codec->extradata_size; memcpy(track->codec_private, codec->extradata, codec->extradata_size); return 0; } @@ -534,8 +538,9 @@ static int handle_file(struct Tracks *tracks, const char *file, int split, 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); |