Merge "Avoid the use of uninitialized value in ActiveMap encoding route" into nextgenv2

23fb2fea · Yaowu Xu · Gerrit Code Review · 10d9627f · 6408895e · 23fb2fea
Commit 23fb2fea authored Oct 24, 2016 by Yaowu Xu Committed by Gerrit Code Review Oct 24, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

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

No files found.
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -9782,6 +9782,7 @@ void av1_rd_pick_inter_mode_sb_seg_skip(const AV1_COMP *cpi,
 #else   // CONFIG_GLOBAL_MOTION
  mbmi->mv[0].as_int = 0;
 #endif  // CONFIG_GLOBAL_MOTION
+  mbmi->tx_size = max_txsize_lookup[bsize];
  x->skip = 1;

 #if CONFIG_REF_MV