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

8f7b1d3d · Yaowu Xu · Gerrit Code Review · 31e76edb · ee775b13 · 8f7b1d3d
Commit 8f7b1d3d authored Oct 18, 2016 by Yaowu Xu Committed by Gerrit Code Review Oct 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

av1/encoder/rdopt.c av1/encoder/rdopt.c +1 -1

No files found.
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -9834,12 +9834,12 @@ void av1_rd_pick_inter_mode_sb_seg_skip(AV1_COMP *cpi, TileDataEnc *tile_data,
 #else   // CONFIG_GLOBAL_MOTION
  mbmi->mv[0].as_int = 0;
 #endif  // CONFIG_GLOBAL_MOTION
+  x->skip = 1;

 #if CONFIG_REF_MV
  mbmi->ref_mv_idx = 0;
  mbmi->pred_mv[0].as_int = 0;
 #endif
-  x->skip = 1;

  if (cm->interp_filter != BILINEAR) {
    best_filter = EIGHTTAP_REGULAR;