Browse Source

Slightly simplify VP8 inter_predict

Merge an if and a switch.
(cherry picked from commit 73be29b0c4)
tags/n0.8
Jason Garrett-Glaser Michael Niedermayer 14 years ago
parent
commit
a4257d74e0
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      libavcodec/vp8.c

+ 3
- 2
libavcodec/vp8.c View File

@@ -1307,10 +1307,11 @@ void inter_predict(VP8Context *s, uint8_t *dst[3], VP8Macroblock *mb,
AVFrame *ref = s->framep[mb->ref_frame]; AVFrame *ref = s->framep[mb->ref_frame];
VP56mv *bmv = mb->bmv; VP56mv *bmv = mb->bmv;


if (mb->mode < VP8_MVMODE_SPLIT) {
switch (mb->partitioning) {
case VP8_SPLITMVMODE_NONE:
vp8_mc_part(s, dst, ref, x_off, y_off, vp8_mc_part(s, dst, ref, x_off, y_off,
0, 0, 16, 16, width, height, &mb->mv); 0, 0, 16, 16, width, height, &mb->mv);
} else switch (mb->partitioning) {
break;
case VP8_SPLITMVMODE_4x4: { case VP8_SPLITMVMODE_4x4: {
int x, y; int x, y;
VP56mv uvmv; VP56mv uvmv;


Loading…
Cancel
Save