Merge changes Ie989e60c,Ifc110b12
authorAlex Converse <aconverse@google.com>
Thu, 23 Mar 2017 18:05:13 +0000 (18:05 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 23 Mar 2017 18:05:13 +0000 (18:05 +0000)
commitd7b220b4678c88815e4e149871f7c571b83aeb86
treee465fc9243bc2b404012127fa3a4ea186379be19
parentd85615738881f1664099bbeb3290df9d59ec7985
parentca9bedd538d728b80502a583d0f138401f50b6f6
Merge changes Ie989e60c,Ifc110b12

* changes:
  Backport "Optimize the use case of token_cost table" to VP9
  Drop vp9_get_token_extracost