mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-10 09:31:06 +02:00
vp8: remove redundant "equals 1" test
mb_layout is either zero or non-zero. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
1a193c438c
commit
f29cdbe1b5
@ -664,7 +664,7 @@ void decode_intra4x4_modes(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb,
|
||||
{
|
||||
uint8_t *intra4x4 = mb->intra4x4_pred_mode_mb;
|
||||
|
||||
if (layout == 1) {
|
||||
if (layout) {
|
||||
VP8Macroblock *mb_top = mb - s->mb_width - 1;
|
||||
memcpy(mb->intra4x4_pred_mode_top, mb_top->intra4x4_pred_mode_top, 4);
|
||||
}
|
||||
@ -672,7 +672,7 @@ void decode_intra4x4_modes(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb,
|
||||
int x, y;
|
||||
uint8_t* top;
|
||||
uint8_t* const left = s->intra4x4_pred_mode_left;
|
||||
if (layout == 1)
|
||||
if (layout)
|
||||
top = mb->intra4x4_pred_mode_top;
|
||||
else
|
||||
top = s->intra4x4_pred_mode_top + 4 * mb_x;
|
||||
@ -714,7 +714,7 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y,
|
||||
decode_intra4x4_modes(s, c, mb, mb_x, 1, layout);
|
||||
} else {
|
||||
const uint32_t modes = vp8_pred4x4_mode[mb->mode] * 0x01010101u;
|
||||
if (s->mb_layout == 1)
|
||||
if (s->mb_layout)
|
||||
AV_WN32A(mb->intra4x4_pred_mode_top, modes);
|
||||
else
|
||||
AV_WN32A(s->intra4x4_pred_mode_top + 4 * mb_x, modes);
|
||||
|
Loading…
Reference in New Issue
Block a user