diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 02:04:35 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 02:05:04 +0300 |
commit | 40e123bc67cca2bb44a737e250481edc1b93048a (patch) | |
tree | e5bf467e5bc476eb091e6cdb7f6e5eb53095d476 /libavcodec/ulti.c | |
parent | f2f88b952d666587fa6292bb219a82d0bee2229f (diff) | |
parent | ed97963bdbf3bb17fca4f9ea0aa1a97722dec907 (diff) |
Merge commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907'
* commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907':
ulti: invert the order of parameters of ulti_decode_frame()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ulti.c')
-rw-r--r-- | libavcodec/ulti.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c index 6b762148bb..d14603a2cd 100644 --- a/libavcodec/ulti.c +++ b/libavcodec/ulti.c @@ -382,12 +382,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; |