From 612abe2773e72cc3942069c104294ab2223338eb Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 19 May 2012 20:05:21 +0200 Subject: Use a variable instead of a repeated calculation when decoding AVUI. --- libavcodec/avuidec.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavcodec/avuidec.c b/libavcodec/avuidec.c index d6dac57..a1beb37 100644 --- a/libavcodec/avuidec.c +++ b/libavcodec/avuidec.c @@ -43,7 +43,7 @@ static int avui_decode_frame(AVCodecContext *avctx, void *data, const uint8_t *src = avpkt->data; const uint8_t *srca; uint8_t *y, *u, *v, *a; - int transparent, interlaced = 1, skip, i, j, k; + int transparent, interlaced = 1, skip, opaque_length, i, j, k; if (pic->data[0]) avctx->release_buffer(avctx, pic); @@ -56,16 +56,14 @@ static int avui_decode_frame(AVCodecContext *avctx, void *data, } else { skip = 16; } - if (avpkt->size < 2 * avctx->width * (avctx->height + skip) - + 4 * interlaced) { + opaque_length = 2 * avctx->width * (avctx->height + skip) + 4 * interlaced; + if (avpkt->size < opaque_length) { av_log(avctx, AV_LOG_ERROR, "Insufficient input data.\n"); return AVERROR(EINVAL); } transparent = avctx->bits_per_coded_sample == 32 && - avpkt->size >= 2 * (avctx->height + skip) * - 2 * avctx->width + 4 + 8 * interlaced; - srca = src + 2 * (avctx->height + skip) * avctx->width - + 5 + interlaced * 4; + avpkt->size >= opaque_length * 2 + 4; + srca = src + opaque_length + 5; pic->reference = 0; -- cgit v1.1