virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '7650caf013f45ebebf128855735a0c6350836ea4'

Browse Source 
* commit '7650caf013f45ebebf128855735a0c6350836ea4':
  rtpdec_h264: Use av_realloc instead of av_malloc+mempcy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-20 21:30:01 +01:00
parent 2130ed3312 7650caf013
commit 5346b57ee7
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/rtpdec_h264.c
View File

@@ -115,18 +115,16 @@ static int parse_sprop_parameter_sets(AVFormatContext *s,
packet_size = av_base64_decode(decoded_packet, base64packet, packet_size = av_base64_decode(decoded_packet, base64packet,
sizeof(decoded_packet)); sizeof(decoded_packet));
if (packet_size > 0) { if (packet_size > 0) {
uint8_t *dest = av_malloc(packet_size + sizeof(start_sequence) + uint8_t *dest = av_realloc(codec->extradata,
codec->extradata_size + packet_size + sizeof(start_sequence) +
FF_INPUT_BUFFER_PADDING_SIZE); codec->extradata_size +
FF_INPUT_BUFFER_PADDING_SIZE);
if (!dest) { if (!dest) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Unable to allocate memory for extradata!\n"); "Unable to allocate memory for extradata!\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if (codec->extradata_size) { codec->extradata = dest;
memcpy(dest, codec->extradata, codec->extradata_size);
av_free(codec->extradata);
}
memcpy(dest + codec->extradata_size, start_sequence, memcpy(dest + codec->extradata_size, start_sequence,
sizeof(start_sequence)); sizeof(start_sequence));
@@ -135,7 +133,6 @@ static int parse_sprop_parameter_sets(AVFormatContext *s,
memset(dest + codec->extradata_size + sizeof(start_sequence) + memset(dest + codec->extradata_size + sizeof(start_sequence) +
packet_size, 0, FF_INPUT_BUFFER_PADDING_SIZE); packet_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
codec->extradata = dest;
codec->extradata_size += sizeof(start_sequence) + packet_size; codec->extradata_size += sizeof(start_sequence) + packet_size;
} }
} }