From ed97963bdbf3bb17fca4f9ea0aa1a97722dec907 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Thu, 18 Dec 2014 20:26:58 +0100 Subject: [PATCH] ulti: invert the order of parameters of ulti_decode_frame() This is the order that the caller uses in the rest of the file. Variables are modified to reflect the order above too and their initialization is merged with their declarationt. No behavioral change. Bug-Id: CID 732286 --- libavcodec/ulti.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c index 186f1a636a..b955dd7c04 100644 --- a/libavcodec/ulti.c +++ b/libavcodec/ulti.c @@ -384,12 +384,11 @@ static int ulti_decode_frame(AVCodecContext *avctx, Y[3] = bytestream2_get_byteu(&s->gb) & 0x3F; ulti_grad(s->frame, tx, ty, Y, chroma, angle); //draw block } else { // some patterns - int f0, f1; - f0 = bytestream2_get_byteu(&s->gb); - f1 = tmp; + int f0 = tmp; + int f1 = bytestream2_get_byteu(&s->gb); Y[0] = bytestream2_get_byteu(&s->gb) & 0x3F; Y[1] = bytestream2_get_byteu(&s->gb) & 0x3F; - ulti_pattern(s->frame, tx, ty, f1, f0, Y[0], Y[1], chroma); + ulti_pattern(s->frame, tx, ty, f0, f1, Y[0], Y[1], chroma); } } break;