wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nuv: Use av_fast_realloc

Browse source 
The decompressed buffer can be used after codec_reinit, so it must be
preserved.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 2df0776c22)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Conflicts:
	libavcodec/nuv.c
This commit is contained in:
Luca Barbato 2013-08-13 07:01:40 +02:00
parent d2eddcfc83
commit c1ebdef01b
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libavcodec/nuv.c
View file

@ -114,16 +114,20 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height, int qualit
if (quality >= 0)
get_quant_quality(c, quality);
if (width != c->width || height != c->height) {
void *ptr;
if ((ret = av_image_check_size(height, width, 0, avctx)) < 0)
return ret;
avctx->width = c->width = width;
avctx->height = c->height = height;
av_fast_malloc(&c->decomp_buf, &c->decomp_size, c->height * c->width * 3 / 2 +
FF_INPUT_BUFFER_PADDING_SIZE);
if (!c->decomp_buf) {
ptr = av_fast_realloc(c->decomp_buf, &c->decomp_size,
c->height * c->width * 3 / 2 +
FF_INPUT_BUFFER_PADDING_SIZE +
RTJPEG_HEADER_SIZE);
if (!ptr) {
av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");
return AVERROR(ENOMEM);
}
} else
c->decomp_buf = ptr;
rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
} else if (quality != c->quality)
rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
@ -200,6 +204,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
q = buf[10];
if ((result = codec_reinit(avctx, w, h, q)) < 0)
return result;
if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO)
buf = c->decomp_buf;
buf = &buf[RTJPEG_HEADER_SIZE];
buf_size -= RTJPEG_HEADER_SIZE;
}