diff options
| author | Jason Garrett-Glaser <jason@x264.com> | 2011-01-29 21:09:33 -0800 |
|---|---|---|
| committer | Jason Garrett-Glaser <jason@x264.com> | 2011-01-30 12:12:02 -0800 |
| commit | 73be29b0c4297fd0e61e7fe5d925bec397d8fe4a (patch) | |
| tree | 06faa8567eecdbbc522b4fdb20fb10bb96ef51f9 /libavcodec/vp8.c | |
| parent | 2855080447a226aba7e88e943fd8a8779d6daa98 (diff) | |
| download | ffmpeg-73be29b0c4297fd0e61e7fe5d925bec397d8fe4a.tar.gz | |
Slightly simplify VP8 inter_predict
Merge an if and a switch.
Diffstat (limited to 'libavcodec/vp8.c')
| -rw-r--r-- | libavcodec/vp8.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index ef4e270f6c..d2f55d90f3 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -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; |