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
This commit is contained in:
Vittorio Giovara 2014-12-18 20:26:58 +01:00
parent 4438c25638
commit ed97963bdb
1 changed files with 3 additions and 4 deletions

View File

@ -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;