diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-10-29 13:37:16 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-10-30 11:04:06 +0000 |
| commit | 2820562935e780acc446e85ce26f03ecbb09b8bd (patch) | |
| tree | d97d43221489efa377d6b5260d2a1b1c4b310cfd /libavcodec/4xm.c | |
| parent | c783bec6dc570d7962f6f485b4966c23642c4e32 (diff) | |
| download | ffmpeg-2820562935e780acc446e85ce26f03ecbb09b8bd.tar.gz | |
avcodec/4xm: use av_fast_padded_malloc()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/4xm.c')
| -rw-r--r-- | libavcodec/4xm.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index a73f8d59fc..eb07cc370d 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; @@ -803,14 +801,12 @@ static int decode_i_frame(FourXContext *f, AVFrame *frame, const uint8_t *buf, i prestream_size = length + buf - prestream; - av_fast_malloc(&f->bitstream_buffer, &f->bitstream_buffer_size, - prestream_size + FF_INPUT_BUFFER_PADDING_SIZE); + av_fast_padded_malloc(&f->bitstream_buffer, &f->bitstream_buffer_size, + prestream_size); if (!f->bitstream_buffer) return AVERROR(ENOMEM); f->dsp.bswap_buf(f->bitstream_buffer, (const uint32_t*)prestream, prestream_size / 4); - memset((uint8_t*)f->bitstream_buffer + prestream_size, - 0, FF_INPUT_BUFFER_PADDING_SIZE); init_get_bits(&f->pre_gb, f->bitstream_buffer, 8 * prestream_size); f->last_dc = 0 * 128 * 8 * 8; |