Slightly simplify VP8 inter_predict

Merge an if and a switch.
(cherry picked from commit 73be29b0c4297fd0e61e7fe5d925bec397d8fe4a)
This commit is contained in:
Jason Garrett-Glaser 2011-01-29 21:09:33 -08:00 committed by Michael Niedermayer
parent 2fa1d7b3be
commit a4257d74e0

View File

@ -1307,10 +1307,11 @@ void inter_predict(VP8Context *s, uint8_t *dst[3], VP8Macroblock *mb,
AVFrame *ref = s->framep[mb->ref_frame];
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,
0, 0, 16, 16, width, height, &mb->mv);
} else switch (mb->partitioning) {
break;
case VP8_SPLITMVMODE_4x4: {
int x, y;
VP56mv uvmv;