diff options
| author | Peter Ross <pross@xvid.org> | 2014-01-19 02:38:45 +1100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 22:26:43 +0100 |
| commit | f29cdbe1b59a0d997733b507041e15ec68cef00c (patch) | |
| tree | 24d62081bac1aeab742d914566cb5d2ac6cc7648 | |
| parent | 1a193c438c9bde825dbe7965e3543cb5ad14309e (diff) | |
| download | ffmpeg-f29cdbe1b59a0d997733b507041e15ec68cef00c.tar.gz | |
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>
| -rw-r--r-- | libavcodec/vp8.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 2ab37825f4..4c5519407a 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -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); |