OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2fa1d7b
)
Slightly simplify VP8 inter_predict
author
Jason Garrett-Glaser
<jason@x264.com>
Sun, 30 Jan 2011 05:09:33 +0000
(21:09 -0800)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 31 Jan 2011 17:25:45 +0000
(18:25 +0100)
Merge an if and a switch.
(cherry picked from commit
73be29b0c4297fd0e61e7fe5d925bec397d8fe4a
)
libavcodec/vp8.c
patch
|
blob
|
history
diff --git
a/libavcodec/vp8.c
b/libavcodec/vp8.c
index
ef4e270
..
d2f55d9
100644
(file)
--- 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;