ref: fccebcba57c6ae57d23047a0759effc014267963
parent: 26a49182825351ba3530f031ab0fc694c7687895
parent: eec0bc4f1e70818e517fff3074d27ec946defbbd
author: Jim Bankoski <jimbankoski@google.com>
date: Fri Dec 7 12:16:01 EST 2012
Merge "Fix implicit cast." into vp9-preview
--- a/vp9/common/vp9_findnearmv.h
+++ b/vp9/common/vp9_findnearmv.h
@@ -150,7 +150,8 @@
if (cur_mb->mbmi.mode < I8X8_PRED) {
return pred_mode_conv(cur_mb->mbmi.mode);
} else if (cur_mb->mbmi.mode == I8X8_PRED) {
- return pred_mode_conv((cur_mb->bmi + 3 + b)->as_mode.first);
+ return pred_mode_conv(
+ (MB_PREDICTION_MODE)(cur_mb->bmi + 3 + b)->as_mode.first);
} else if (cur_mb->mbmi.mode == B_PRED) {
return ((cur_mb->bmi + 3 + b)->as_mode.first);
} else {
@@ -169,7 +170,8 @@
if (cur_mb->mbmi.mode < I8X8_PRED) {
return pred_mode_conv(cur_mb->mbmi.mode);
} else if (cur_mb->mbmi.mode == I8X8_PRED) {
- return pred_mode_conv((cur_mb->bmi + 12 + b)->as_mode.first);
+ return pred_mode_conv(
+ (MB_PREDICTION_MODE)(cur_mb->bmi + 12 + b)->as_mode.first);
} else if (cur_mb->mbmi.mode == B_PRED) {
return ((cur_mb->bmi + 12 + b)->as_mode.first);
} else {