Merge changes Ia5978d91,I3e3754f3
authorAngie Chiang <angiebird@google.com>
Thu, 11 Oct 2018 01:18:45 +0000 (01:18 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 11 Oct 2018 01:18:45 +0000 (01:18 +0000)
commit6f56d8b86981b40fc36222f7e754b96fd07ce0d9
treef2678a962d690ea2dfbe4ffbc52c6242d9d55755
parent4a2ea54a672bffc331746e1eac0d008ceed0b5a9
parent1072267dc1d03df3415894dd2db86db605eaf05c
Merge changes Ia5978d91,I3e3754f3

* changes:
  Simplify mode_estimation / tpl_model_store
  Move [inter/intra]_cost change to mode_estimation
vp9/encoder/vp9_encoder.c