RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Peter Ross 2014-01-19 02:38:45 +11:00 committed by Michael Niedermayer
parent 1a193c438c
commit f29cdbe1b5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vp8.c
View File

@ -664,7 +664,7 @@ void decode_intra4x4_modes(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb,
{ {
uint8_t *intra4x4 = mb->intra4x4_pred_mode_mb; uint8_t *intra4x4 = mb->intra4x4_pred_mode_mb;
if (layout == 1) { if (layout) {
VP8Macroblock *mb_top = mb - s->mb_width - 1; VP8Macroblock *mb_top = mb - s->mb_width - 1;
memcpy(mb->intra4x4_pred_mode_top, mb_top->intra4x4_pred_mode_top, 4); 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; int x, y;
uint8_t* top; uint8_t* top;
uint8_t* const left = s->intra4x4_pred_mode_left; uint8_t* const left = s->intra4x4_pred_mode_left;
if (layout == 1) if (layout)
top = mb->intra4x4_pred_mode_top; top = mb->intra4x4_pred_mode_top;
else else
top = s->intra4x4_pred_mode_top + 4 * mb_x; 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); decode_intra4x4_modes(s, c, mb, mb_x, 1, layout);
} else { } else {
const uint32_t modes = vp8_pred4x4_mode[mb->mode] * 0x01010101u; 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); AV_WN32A(mb->intra4x4_pred_mode_top, modes);
else else
AV_WN32A(s->intra4x4_pred_mode_top + 4 * mb_x, modes); AV_WN32A(s->intra4x4_pred_mode_top + 4 * mb_x, modes);