Browse Source

Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of NALs in rbsp_buffer.

Fixes valgrind uninitialized value warnings at the end of decoding H.264
frames.

Originally committed as revision 16230 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Alexander Strange 16 years ago
parent
commit
d43696309a
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      libavcodec/h264.c

+ 3
- 1
libavcodec/h264.c View File

@@ -1406,7 +1406,7 @@ static const uint8_t *decode_nal(H264Context *h, const uint8_t *src, int *dst_le
}

bufidx = h->nal_unit_type == NAL_DPC ? 1 : 0; // use second escape buffer for inter data
h->rbsp_buffer[bufidx]= av_fast_realloc(h->rbsp_buffer[bufidx], &h->rbsp_buffer_size[bufidx], length);
h->rbsp_buffer[bufidx]= av_fast_realloc(h->rbsp_buffer[bufidx], &h->rbsp_buffer_size[bufidx], length+FF_INPUT_BUFFER_PADDING_SIZE);
dst= h->rbsp_buffer[bufidx];

if (dst == NULL){
@@ -1430,6 +1430,8 @@ static const uint8_t *decode_nal(H264Context *h, const uint8_t *src, int *dst_le
dst[di++]= src[si++];
}

memset(dst+di, 0, FF_INPUT_BUFFER_PADDING_SIZE);

*dst_length= di;
*consumed= si + 1;//+1 for the header
//FIXME store exact number of bits in the getbitcontext (it is needed for decoding)


Loading…
Cancel
Save