commit b0d0d00b44534b144c8d3fddfc78f73dc967bf32
author Yaowu Xu <yaowu@google.com> Tue Nov 22 09:26:43 2016 -0800
committer Yaowu Xu <yaowu@google.com> Tue Nov 22 18:43:27 2016 +0000
tree d1d9b1c7f70aed0749672adf733a85c1919b79c8
parent dc882e61606c96f46673b4887367ea4ec55e8acf

Fix static-analysis warnings

This commit fixes the warnings of "value stored to 'mode_ctx' during
its initialization is never read".

Change-Id: I39e78a5915d29c74854306d009b7a6e002dda781

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 6114e5d..8ac38e8 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4394,7 +4394,7 @@
   const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[mbmi->sb_type];
   const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[mbmi->sb_type];
   const int is_compound = has_second_ref(mbmi);
-  int mode_ctx = mbmi_ext->mode_context[mbmi->ref_frame[0]];
+  int mode_ctx;
 
   switch (mode) {
     case NEWMV:
@@ -4534,7 +4534,9 @@
 #endif  // CONFIG_EXT_INTER
     mode_ctx = av1_mode_context_analyzer(mbmi_ext->mode_context,
                                          mbmi->ref_frame, mbmi->sb_type, i);
-#endif
+#else  // CONFIG_REF_MV
+  mode_ctx = mbmi_ext->mode_context[mbmi->ref_frame[0]];
+#endif  // CONFIG_REF_MV
 #if CONFIG_REF_MV && CONFIG_EXT_INTER
   return cost_mv_ref(cpi, mode, is_compound, mode_ctx) + thismvcost;
 #else
@@ -6979,7 +6981,7 @@
 
   int skip_txfm_sb = 0;
   int64_t skip_sse_sb = INT64_MAX;
-  int16_t mode_ctx = mbmi_ext->mode_context[refs[0]];
+  int16_t mode_ctx;
 #if CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
   av1_invalid_rd_stats(&best_rd_stats);
 #endif
@@ -7004,7 +7006,9 @@
 #endif  // CONFIG_EXT_INTER
     mode_ctx = av1_mode_context_analyzer(mbmi_ext->mode_context,
                                          mbmi->ref_frame, bsize, -1);
-#endif
+#else   // CONFIG_REF_MV
+  mode_ctx = mbmi_ext->mode_context[refs[0]];
+#endif  // CONFIG_REF_MV
 
 #if CONFIG_AOM_HIGHBITDEPTH
   if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH)