summaryrefslogtreecommitdiff
path: root/libavcodec/huffyuv.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-12-06 16:31:54 +0000
committerPaul B Mahol <onemda@gmail.com>2012-12-06 16:31:54 +0000
commit7f261ac850253c8c4aa5df1b216d0f62b0bdcecd (patch)
tree3d96a93909bca9a429985db704dab1d437919675 /libavcodec/huffyuv.c
parenteaa47e745492c8368384c7aec987a7c8799417c4 (diff)
downloadffmpeg-7f261ac850253c8c4aa5df1b216d0f62b0bdcecd.tar.gz
huffyuv: make use of av_fast_padded_malloc()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/huffyuv.c')
-rw-r--r--libavcodec/huffyuv.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index 6598144aeb..eb30078e03 100644
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -992,13 +992,12 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVFrame *picture = data;
- av_fast_malloc(&s->bitstream_buffer,
+ av_fast_padded_malloc(&s->bitstream_buffer,
&s->bitstream_buffer_size,
- buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ buf_size);
if (!s->bitstream_buffer)
return AVERROR(ENOMEM);
- memset(s->bitstream_buffer + buf_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
s->dsp.bswap_buf((uint32_t*)s->bitstream_buffer,
(const uint32_t*)buf, buf_size / 4);