ref: f1f28535c37104450be51d089f077d5ea3cc3fc3
parent: 84c3cd79d1f551f18fb74db7405f5df1f3260129
parent: 139577f9376e1607581a0152f97ba90b3af964f4
author: Yunqing Wang <yunqingwang@google.com>
date: Wed Jul 13 09:32:57 EDT 2011
Merge "Fix unnecessary casting of B_PREDICTION_MODE (issue 349)"
--- a/vp8/decoder/decodemv.c
+++ b/vp8/decoder/decodemv.c
@@ -180,11 +180,11 @@
return (MB_PREDICTION_MODE)i;
}
-static MB_PREDICTION_MODE sub_mv_ref(vp8_reader *bc, const vp8_prob *p)
+static B_PREDICTION_MODE sub_mv_ref(vp8_reader *bc, const vp8_prob *p)
{const int i = vp8_treed_read(bc, vp8_sub_mv_ref_tree, p);
- return (MB_PREDICTION_MODE)i;
+ return (B_PREDICTION_MODE)i;
}
#ifdef VPX_MODE_COUNT
@@ -334,7 +334,7 @@
abovemv.as_int = above_block_mv(mi, k, mis);
mv_contz = vp8_mv_cont(&leftmv, &abovemv);
- switch ((B_PREDICTION_MODE) sub_mv_ref(bc, vp8_sub_mv_ref_prob2 [mv_contz])) /*pc->fc.sub_mv_ref_prob))*/
+ switch (sub_mv_ref(bc, vp8_sub_mv_ref_prob2 [mv_contz])) /*pc->fc.sub_mv_ref_prob))*/
{case NEW4X4:
read_mv(bc, &blockmv.as_mv, (const MV_CONTEXT *) mvc);
--
⑨