commit 811bba79a846fce30cee69ed9b5e0c6dd33ac1d1
author Cheng Chen <chengchen@google.com> Mon Aug 21 17:39:31 2017 -0700
committer Cheng Chen <chengchen@google.com> Tue Aug 22 16:32:31 2017 +0000
tree 9b3175329d2b64e92e102617c701baa2be24a350
parent 77323261e6c75d129dc46b6e448020f75a894426

Silence warnings when warped_motion is disabled

Change-Id: I5da893be07b3b9aa4351b5bb1af987f4992370ef

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 7590200..4de7c9f 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -300,7 +300,7 @@
 static MOTION_MODE read_motion_mode(AV1_COMMON *cm, MACROBLOCKD *xd,
                                     MODE_INFO *mi, aom_reader *r) {
   MB_MODE_INFO *mbmi = &mi->mbmi;
-#if CONFIG_NEW_MULTISYMBOL || CONFIG_NCOBMC_ADAPT_WEIGHT
+#if !CONFIG_MOTION_VAR || !CONFIG_WARPED_MOTION || CONFIG_NEW_MULTISYMBOL
   (void)cm;
 #endif
 

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 27171e8..272ac57 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -8444,6 +8444,9 @@
   (void)rate_mv;
   (void)is_comp_pred;
   (void)this_mode;
+#if !CONFIG_WARPED_MOTION
+  (void)single_newmv;
+#endif
 
 #if CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
   MOTION_MODE motion_mode, last_motion_mode_allowed;