commit eb649729bf446f38d17429d539640bb98b9eaddc
author Thomas Davies <thdavies@cisco.com> Fri Mar 31 16:12:57 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Tue Apr 04 11:18:21 2017 +0100
tree 2dc408dff1349861c886d033df123e92cd42a4eb
parent 1d4568c00dcb67a1997a6563d1128432c25c4252

Enable new_tokenset by default and fix experiment compatibility.

Change-Id: Ifd55343b701eb753537b9711abd377adcedde8ec

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 2bd6291..d364cba 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -855,7 +855,7 @@
 }
 #endif
 
-#if CONFIG_NEW_TOKENSET
+#if CONFIG_NEW_TOKENSET && !CONFIG_LV_MAP
 static void pack_mb_tokens(aom_writer *w, const TOKENEXTRA **tp,
                            const TOKENEXTRA *const stop,
                            aom_bit_depth_t bit_depth, const TX_SIZE tx_size,