commit a7fd44a5e726fdc0a74b2d7c17c2e1e312d1694c
author Urvang Joshi <urvang@google.com> Tue Oct 23 14:36:30 2018 -0700
committer Urvang Joshi <urvang@google.com> Wed Oct 24 23:46:05 2018 +0000
tree db7b2e0d9bc051b85e2a7850bae7e9bb845318cc
parent 864ae6a7ad458076a221acc74d02e78c8fb17773

Fix build with CONFIG_FIX_GF_LENGTH=0

Change-Id: I01e95b8d897153e8b818c2197049744b2004cb81

av1/encoder/firstpass.c

diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c
index 2c3e00f..1098530 100644
--- a/av1/encoder/firstpass.c
+++ b/av1/encoder/firstpass.c
@@ -2192,9 +2192,13 @@
     }
   }
 
+#if USE_SYMM_MULTI_LAYER
+#if NEW_MULTI_LVL_BOOST_VBR_ALLOC
   // Save.
   const int tmp_frame_index = frame_index;
   int budget_reduced_from_leaf_level = 0;
+#endif  // NEW_MULTI_LVL_BOOST_VBR_ALLOC
+#endif  // USE_SYMM_MULTI_LAYER
 
   // Allocate bits to the other frames in the group.
   for (i = 0; i < rc->baseline_gf_interval - rc->source_alt_ref_pending; ++i) {

av1/encoder/ratectrl.h

diff --git a/av1/encoder/ratectrl.h b/av1/encoder/ratectrl.h
index 4133581..257cc88 100644
--- a/av1/encoder/ratectrl.h
+++ b/av1/encoder/ratectrl.h
@@ -42,6 +42,7 @@
 #define REDUCE_LAST_GF_LENGTH 1
 #define MULTI_LVL_BOOST_VBR_CQ 1
 #else
+#define MAX_PYRAMID_SIZE 16
 #define USE_SYMM_MULTI_LAYER 0
 #define REDUCE_LAST_ALT_BOOST 0
 #define REDUCE_LAST_GF_LENGTH 0