mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-23 11:19:55 +00:00
Merge commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907'
* commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907': ulti: invert the order of parameters of ulti_decode_frame() Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
40e123bc67
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user