Merge changes I0089e884,Icb0ecb9e
authorJames Zern <jzern@google.com>
Sat, 23 Jul 2016 01:18:31 +0000 (01:18 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Sat, 23 Jul 2016 01:18:32 +0000 (01:18 +0000)
commit5cf8eda308e0bd54343a954a5dc0597a4f4e98eb
treef39f7c42d880775f87855be4ec29340eef82042d
parent256a4af4d11330e4c540095b4c44e904c3ff5aba
parentb2542417cd4dc81c49faa242c3bfdacab853ba6c
Merge changes I0089e884,Icb0ecb9e

* changes:
  vp8/postproc: fix implicit float conversion
  blockiness_test: fix implicit float conversion