[FFmpeg-devel] [PATCH] avcodec/4xm: use av_fast_padded_malloc()

Paul B Mahol onemda at gmail.com
Tue Oct 29 14:40:38 CET 2013


Signed-off-by: Paul B Mahol <onemda at gmail.com>
---
 libavcodec/4xm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index a73f8d5..66b61d8 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -461,14 +461,12 @@ static int decode_p_frame(FourXContext *f, AVFrame *frame,
         return AVERROR_INVALIDDATA;
     }
 
-    av_fast_malloc(&f->bitstream_buffer, &f->bitstream_buffer_size,
-                   bitstream_size + FF_INPUT_BUFFER_PADDING_SIZE);
+    av_fast_padded_malloc(&f->bitstream_buffer, &f->bitstream_buffer_size,
+                          bitstream_size);
     if (!f->bitstream_buffer)
         return AVERROR(ENOMEM);
     f->dsp.bswap_buf(f->bitstream_buffer, (const uint32_t*)(buf + extra),
                      bitstream_size / 4);
-    memset((uint8_t*)f->bitstream_buffer + bitstream_size,
-           0, FF_INPUT_BUFFER_PADDING_SIZE);
     init_get_bits(&f->gb, f->bitstream_buffer, 8 * bitstream_size);
 
     wordstream_offset = extra + bitstream_size;
-- 
1.7.11.2



More information about the ffmpeg-devel mailing list