Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-02-19 06:47:52 +0400
committerMichael Niedermayer <michaelni@gmx.at>2012-02-19 06:57:54 +0400
commite98a76d3c293f8d125c24df8b06c42f23972e93b (patch)
treedc97ee498f216020eb9f9bf88a7a05eb976746d2 /libavcodec/h264.c
parentb6a08665d61d7fecc0532d3d9dac5901b3e7dbd8 (diff)
h264: use av_fast_padded_malloc()
This zeros all the memory once and avoids valgrind warnings. alternatively the warnings could be suppressed. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 3b74e25636..e1d8c5fe59 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -179,10 +179,8 @@ const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src, int *dst_l
bufidx = h->nal_unit_type == NAL_DPC ? 1 : 0; // use second escape buffer for inter data
si=h->rbsp_buffer_size[bufidx];
- av_fast_malloc(&h->rbsp_buffer[bufidx], &h->rbsp_buffer_size[bufidx], length+FF_INPUT_BUFFER_PADDING_SIZE+MAX_MBPAIR_SIZE);
+ av_fast_padded_malloc(&h->rbsp_buffer[bufidx], &h->rbsp_buffer_size[bufidx], length+MAX_MBPAIR_SIZE);
dst= h->rbsp_buffer[bufidx];
- if(si != h->rbsp_buffer_size[bufidx])
- memset(dst + length, 0, FF_INPUT_BUFFER_PADDING_SIZE+MAX_MBPAIR_SIZE);
if (dst == NULL){
return NULL;