RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf: Allocate arrays with av_realloc if they will be realloced later 

Pointers returned from av_malloc can't in general be passed
to av_realloc.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2013-09-26 16:34:04 +03:00
parent 1af78b865b
commit 06ebc0bf9a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/concat.c
View File

@ -74,7 +74,7 @@ static av_cold int concat_open(URLContext *h, const char *uri, int flags)
return AVERROR(ENAMETOOLONG); return AVERROR(ENAMETOOLONG);
} }
if (!(nodes = av_malloc(sizeof(*nodes) * len))) { if (!(nodes = av_realloc(NULL, sizeof(*nodes) * len))) {
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} else } else
data->nodes = nodes; data->nodes = nodes;

4
libavformat/rtpdec_qt.c
View File

@ -179,7 +179,7 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt,
} else { } else {
av_freep(&qt->pkt.data); av_freep(&qt->pkt.data);
av_init_packet(&qt->pkt); av_init_packet(&qt->pkt);
qt->pkt.data = av_malloc(alen + FF_INPUT_BUFFER_PADDING_SIZE); qt->pkt.data = av_realloc(NULL, alen + FF_INPUT_BUFFER_PADDING_SIZE);
if (!qt->pkt.data) if (!qt->pkt.data)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
qt->pkt.size = 0; qt->pkt.size = 0;
@ -213,7 +213,7 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt,
pkt->stream_index = st->index; pkt->stream_index = st->index;
if (qt->remaining > 0) { if (qt->remaining > 0) {
av_freep(&qt->pkt.data); av_freep(&qt->pkt.data);
qt->pkt.data = av_malloc(qt->remaining * qt->bytes_per_frame); qt->pkt.data = av_realloc(NULL, qt->remaining * qt->bytes_per_frame);
if (!qt->pkt.data) { if (!qt->pkt.data) {
av_free_packet(pkt); av_free_packet(pkt);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);