Merge "Reconcile active_map and cyclic refresh"
authorAlex Converse <aconverse@google.com>
Fri, 13 Mar 2015 17:20:15 +0000 (10:20 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 13 Mar 2015 17:20:15 +0000 (10:20 -0700)
1  2 
vp9/encoder/vp9_pickmode.c

Simple merge