Merge "Move a statement to match order in aom/master" into nextgenv2

This commit is contained in:
Yaowu Xu
2016-10-18 17:58:32 +00:00
committed by Gerrit Code Review

View File

@@ -9834,12 +9834,12 @@ void av1_rd_pick_inter_mode_sb_seg_skip(AV1_COMP *cpi, TileDataEnc *tile_data,
#else // CONFIG_GLOBAL_MOTION #else // CONFIG_GLOBAL_MOTION
mbmi->mv[0].as_int = 0; mbmi->mv[0].as_int = 0;
#endif // CONFIG_GLOBAL_MOTION #endif // CONFIG_GLOBAL_MOTION
x->skip = 1;
#if CONFIG_REF_MV #if CONFIG_REF_MV
mbmi->ref_mv_idx = 0; mbmi->ref_mv_idx = 0;
mbmi->pred_mv[0].as_int = 0; mbmi->pred_mv[0].as_int = 0;
#endif #endif
x->skip = 1;
if (cm->interp_filter != BILINEAR) { if (cm->interp_filter != BILINEAR) {
best_filter = EIGHTTAP_REGULAR; best_filter = EIGHTTAP_REGULAR;