virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

av_memcpy_backptr: Drop no longer necessary malloc padding

Browse Source 
Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Diego Biurrun 2012-10-23 19:22:52 +02:00 committed by Mans Rullgard
parent d82f188504
commit e831b3b852
3 changed files with 4 additions and 4 deletions

2
libavcodec/dfa.c

@ -43,7 +43,7 @@ static av_cold int dfa_decode_init(AVCodecContext *avctx)
if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0) if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0)
return ret; return ret;
s->frame_buf = av_mallocz(avctx->width * avctx->height + AV_LZO_OUTPUT_PADDING); s->frame_buf = av_mallocz(avctx->width * avctx->height);
if (!s->frame_buf) if (!s->frame_buf)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);

3
libavcodec/eatgv.c

@ -294,8 +294,7 @@ static int tgv_decode_frame(AVCodecContext *avctx,
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID; s->frame.buffer_hints = FF_BUFFER_HINTS_VALID;
s->frame.linesize[0] = s->width; s->frame.linesize[0] = s->width;
/* allocate additional 12 bytes to accommodate av_memcpy_backptr() OUTBUF_PADDED optimisation */ s->frame.data[0] = av_malloc(s->width * s->height);
s->frame.data[0] = av_malloc(s->width*s->height + 12);
if (!s->frame.data[0]) if (!s->frame.data[0])
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
s->frame.data[1] = av_malloc(AVPALETTE_SIZE); s->frame.data[1] = av_malloc(AVPALETTE_SIZE);

3
libavcodec/lcldec.c

@ -476,7 +476,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
{ {
LclDecContext * const c = avctx->priv_data; LclDecContext * const c = avctx->priv_data;
unsigned int basesize = avctx->width * avctx->height; unsigned int basesize = avctx->width * avctx->height;
unsigned int max_basesize = FFALIGN(avctx->width, 4) * FFALIGN(avctx->height, 4) + AV_LZO_OUTPUT_PADDING; unsigned int max_basesize = FFALIGN(avctx->width, 4) *
FFALIGN(avctx->height, 4);
unsigned int max_decomp_size; unsigned int max_decomp_size;
if (avctx->extradata_size < 8) { if (avctx->extradata_size < 8) {