diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2011-07-13 13:32:57 -0700 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-07-13 13:32:57 -0700 |
| commit | f1f28535c37104450be51d089f077d5ea3cc3fc3 (patch) | |
| tree | dbccf4455acde0bac144ad57fa1b30e245b53666 /vp8 | |
| parent | 84c3cd79d1f551f18fb74db7405f5df1f3260129 (diff) | |
| parent | 139577f9376e1607581a0152f97ba90b3af964f4 (diff) | |
| download | libvpx-f1f28535c37104450be51d089f077d5ea3cc3fc3.tar libvpx-f1f28535c37104450be51d089f077d5ea3cc3fc3.tar.gz libvpx-f1f28535c37104450be51d089f077d5ea3cc3fc3.tar.bz2 libvpx-f1f28535c37104450be51d089f077d5ea3cc3fc3.zip | |
Merge "Fix unnecessary casting of B_PREDICTION_MODE (issue 349)"
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/decoder/decodemv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp8/decoder/decodemv.c b/vp8/decoder/decodemv.c index 01d940233..0a7942d89 100644 --- a/vp8/decoder/decodemv.c +++ b/vp8/decoder/decodemv.c @@ -180,11 +180,11 @@ static MB_PREDICTION_MODE read_mv_ref(vp8_reader *bc, const vp8_prob *p) 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 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, 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); |