Skip to content
GitLab
Commit eec0bc4f authored by Frank Galligan's avatar Frank Galligan
Browse files

Fix implicit cast. 

Change-Id: I1eb7433061a6c529471026e0ebdc6467942062eb
parent 434336b0
v1.14.0-linphone 1.4.X experimental feature/update_to_v1.9.0-linphone feature/uwp_nuget forest frame_parallel highbitdepth indianrunnerduck javanwhistlingduck khakicampbell linphone linphone-android linphone-old longtailedduck m29-baseline m31-baseline m49-2623 m52-2743 m54-2840 m56-2924 m66-3359 m68-3440 mandarinduck mcw mcw2 nextgen nextgenv2 pcs-2013 playground sandbox/Jingning/experimental sandbox/Jingning/transcode sandbox/Jingning/vpx sandbox/aconverse@google.com/ansbench sandbox/debargha/playground sandbox/hkuang/frame_parallel sandbox/hkuang@google.com/decode sandbox/jimbankoski@google.com/proposed-aom sandbox/jingning@google.com/decoder_test_suite sandbox/jingning@google.com/experimental sandbox/jzern@google.com/test sandbox/wangch@google.com/vp9 sandbox/yaowu@google.com/mergeaom stable-vp9-decoder v1.12.0-linphone v1.6.1_linphone v1.7.0-linphone v1.9.0-linphone vp9-preview v1.9.0 v1.9.0-rc1 v1.8.2 v1.8.1 v1.8.0 v1.7.0 v1.6.1 v1.6.0 v1.5.0 v1.4.0 v1.3.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 2 deletions
vp9/common/vp9_findnearmv.h
+ 4
− 2
View file @ eec0bc4f
...@@ -150,7 +150,8 @@ static B_PREDICTION_MODE left_block_mode(const MODE_INFO *cur_mb, int b) { ...@@ -150,7 +150,8 @@ static B_PREDICTION_MODE left_block_mode(const MODE_INFO *cur_mb, int b) {
if (cur_mb->mbmi.mode < I8X8_PRED) { if (cur_mb->mbmi.mode < I8X8_PRED) {
return pred_mode_conv(cur_mb->mbmi.mode); return pred_mode_conv(cur_mb->mbmi.mode);
} else if (cur_mb->mbmi.mode == I8X8_PRED) { } 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) { } else if (cur_mb->mbmi.mode == B_PRED) {
return ((cur_mb->bmi + 3 + b)->as_mode.first); return ((cur_mb->bmi + 3 + b)->as_mode.first);
} else { } else {
...@@ -169,7 +170,8 @@ static B_PREDICTION_MODE above_block_mode(const MODE_INFO *cur_mb, ...@@ -169,7 +170,8 @@ static B_PREDICTION_MODE above_block_mode(const MODE_INFO *cur_mb,
if (cur_mb->mbmi.mode < I8X8_PRED) { if (cur_mb->mbmi.mode < I8X8_PRED) {
return pred_mode_conv(cur_mb->mbmi.mode); return pred_mode_conv(cur_mb->mbmi.mode);
} else if (cur_mb->mbmi.mode == I8X8_PRED) { } 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) { } else if (cur_mb->mbmi.mode == B_PRED) {
return ((cur_mb->bmi + 12 + b)->as_mode.first); return ((cur_mb->bmi + 12 + b)->as_mode.first);
} else { } else {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment