From 7650caf013f45ebebf128855735a0c6350836ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 19 Feb 2015 21:12:06 +0200 Subject: [PATCH] rtpdec_h264: Use av_realloc instead of av_malloc+mempcy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is similar to what was done for rtpdec_hevc in ced7238cd01. Signed-off-by: Martin Storsjö --- libavformat/rtpdec_h264.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c index 7abfde7365..d24fa3246b 100644 --- a/libavformat/rtpdec_h264.c +++ b/libavformat/rtpdec_h264.c @@ -115,18 +115,16 @@ static int parse_sprop_parameter_sets(AVFormatContext *s, packet_size = av_base64_decode(decoded_packet, base64packet, sizeof(decoded_packet)); if (packet_size > 0) { - uint8_t *dest = av_malloc(packet_size + sizeof(start_sequence) + - codec->extradata_size + - FF_INPUT_BUFFER_PADDING_SIZE); + uint8_t *dest = av_realloc(codec->extradata, + packet_size + sizeof(start_sequence) + + codec->extradata_size + + FF_INPUT_BUFFER_PADDING_SIZE); if (!dest) { av_log(s, AV_LOG_ERROR, "Unable to allocate memory for extradata!\n"); return AVERROR(ENOMEM); } - if (codec->extradata_size) { - memcpy(dest, codec->extradata, codec->extradata_size); - av_free(codec->extradata); - } + codec->extradata = dest; memcpy(dest + codec->extradata_size, 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) + packet_size, 0, FF_INPUT_BUFFER_PADDING_SIZE); - codec->extradata = dest; codec->extradata_size += sizeof(start_sequence) + packet_size; } }