har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'ced7238cd01cc2199acf9225305628641a27c1d7'

Browse Source 
* commit 'ced7238cd01cc2199acf9225305628641a27c1d7':
  rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-15 23:23:49 +02:00
commit f09162c06b
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/rtpdec_hevc.c
View File

@ -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;
}
}