mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-27 21:40:34 +00:00
Merge commit '06ebc0bf9a6401733a4ce1310325de19f631819a'
* commit '06ebc0bf9a6401733a4ce1310325de19f631819a': lavf: Allocate arrays with av_realloc if they will be realloced later Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
328a5b93d3
@ -74,7 +74,7 @@ static av_cold int concat_open(URLContext *h, const char *uri, int flags)
|
||||
return AVERROR(ENAMETOOLONG);
|
||||
}
|
||||
|
||||
if (!(nodes = av_malloc(sizeof(*nodes) * len))) {
|
||||
if (!(nodes = av_realloc(NULL, sizeof(*nodes) * len))) {
|
||||
return AVERROR(ENOMEM);
|
||||
} else
|
||||
data->nodes = nodes;
|
||||
|
@ -179,7 +179,7 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt,
|
||||
} else {
|
||||
av_freep(&qt->pkt.data);
|
||||
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)
|
||||
return AVERROR(ENOMEM);
|
||||
qt->pkt.size = 0;
|
||||
@ -213,7 +213,7 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt,
|
||||
pkt->stream_index = st->index;
|
||||
if (qt->remaining > 0) {
|
||||
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) {
|
||||
av_free_packet(pkt);
|
||||
return AVERROR(ENOMEM);
|
||||
|
Loading…
Reference in New Issue
Block a user