diff options
| author | Martin Storsjö <martin@martin.st> | 2014-10-15 16:21:27 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-10-15 20:54:32 +0300 |
| commit | ced7238cd01cc2199acf9225305628641a27c1d7 (patch) | |
| tree | 2e635dbac47be10412bb3f7d6569055c322d7008 | |
| parent | 752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8 (diff) | |
| download | ffmpeg-ced7238cd01cc2199acf9225305628641a27c1d7.tar.gz | |
rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/rtpdec_hevc.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c index 72bf7751d2..49789b04a7 100644 --- a/libavformat/rtpdec_hevc.c +++ b/libavformat/rtpdec_hevc.c @@ -124,24 +124,20 @@ static av_cold int hevc_sdp_parse_fmtp_config(AVFormatContext *s, decoded_packet_size = av_base64_decode(decoded_packet, base64packet, sizeof(decoded_packet)); if (decoded_packet_size > 0) { - uint8_t *dest = av_malloc(decoded_packet_size + + uint8_t *tmp = av_realloc(*data_ptr, decoded_packet_size + sizeof(start_sequence) + *size_ptr); - if (!dest) { + if (!tmp) { av_log(s, AV_LOG_ERROR, "Unable to allocate memory for extradata!\n"); return AVERROR(ENOMEM); } - if (*size_ptr) { - memcpy(dest, *data_ptr, *size_ptr); - av_free(*data_ptr); - } + *data_ptr = tmp; - memcpy(dest + *size_ptr, start_sequence, + memcpy(*data_ptr + *size_ptr, start_sequence, sizeof(start_sequence)); - memcpy(dest + *size_ptr + sizeof(start_sequence), + memcpy(*data_ptr + *size_ptr + sizeof(start_sequence), decoded_packet, decoded_packet_size); - *data_ptr = dest; *size_ptr += sizeof(start_sequence) + decoded_packet_size; } } |