Properly pad H.264 extradata when taken from fmtp SDP attributes
authorMartin Storsjö <martin@martin.st>
Wed, 3 Mar 2010 21:00:50 +0000 (21:00 +0000)
committerMartin Storsjö <martin@martin.st>
Wed, 3 Mar 2010 21:00:50 +0000 (21:00 +0000)
This fixes some valgrind warnings.

Originally committed as revision 22182 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/rtpdec_h264.c

index f41dfdc..970e6fd 100644 (file)
@@ -134,7 +134,9 @@ static void sdp_parse_fmtp_config_h264(AVStream * stream,
 
             packet_size= av_base64_decode(decoded_packet, base64packet, sizeof(decoded_packet));
             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(codec->extradata_size)
@@ -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+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_size+= sizeof(start_sequence)+packet_size;