Skip to content
Snippets Groups Projects
Commit b9b8ed2a authored by Martin Storsjö's avatar Martin Storsjö
Browse files

Properly pad H.264 extradata when taken from fmtp SDP attributes

This fixes some valgrind warnings.

Originally committed as revision 22182 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent bd8868e0
No related branches found
No related tags found
No related merge requests found
...@@ -134,7 +134,9 @@ static void sdp_parse_fmtp_config_h264(AVStream * stream, ...@@ -134,7 +134,9 @@ static void sdp_parse_fmtp_config_h264(AVStream * stream,
packet_size= av_base64_decode(decoded_packet, base64packet, sizeof(decoded_packet)); packet_size= av_base64_decode(decoded_packet, base64packet, sizeof(decoded_packet));
if (packet_size) { if (packet_size) {
uint8_t *dest= av_malloc(packet_size+sizeof(start_sequence)+codec->extradata_size); uint8_t *dest = av_malloc(packet_size + sizeof(start_sequence) +
codec->extradata_size +
FF_INPUT_BUFFER_PADDING_SIZE);
if(dest) if(dest)
{ {
if(codec->extradata_size) if(codec->extradata_size)
...@@ -146,6 +148,8 @@ static void sdp_parse_fmtp_config_h264(AVStream * stream, ...@@ -146,6 +148,8 @@ static void sdp_parse_fmtp_config_h264(AVStream * stream,
memcpy(dest+codec->extradata_size, start_sequence, sizeof(start_sequence)); memcpy(dest+codec->extradata_size, start_sequence, sizeof(start_sequence));
memcpy(dest+codec->extradata_size+sizeof(start_sequence), decoded_packet, packet_size); memcpy(dest+codec->extradata_size+sizeof(start_sequence), decoded_packet, packet_size);
memset(dest+codec->extradata_size+sizeof(start_sequence)+
packet_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
codec->extradata= dest; codec->extradata= dest;
codec->extradata_size+= sizeof(start_sequence)+packet_size; codec->extradata_size+= sizeof(start_sequence)+packet_size;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment