commit 17fd2f2332110963aac466a7bd53a9ef7e4a5411
author Yaowu Xu <yaowu@google.com> Thu Nov 17 18:23:28 2016 -0800
committer Yaowu Xu <yaowu@google.com> Fri Nov 18 05:27:40 2016 +0000
tree edf4ca45a5a72bc2f0514a2a460899566b8f39ea
parent 33f210c697dd516886bf023703a5d1093d029305

Get several experiments to build together

This commit fixes several issues that prevent experiments to build
when enabled together. The experiments are:
ec-adapt
ext-inter
ext-partition

BUG=aomedia:80
BUG=aomedia:88

Change-Id: I5b790f16ad0ae2450f0be3aa26329b6a57a6a5c5

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index abbcc7e..4de60ef 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -3154,7 +3154,7 @@
   1,
   4,
   4,
-  6
+  6,
 #if CONFIG_EXT_PARTITION
   // TODO(debargha): What are the correct numbers here?
   8,