Merge changes Ic362b088,I1c65c2aa
authorJames Zern <jzern@google.com>
Tue, 4 Feb 2014 07:07:35 +0000 (23:07 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 4 Feb 2014 07:07:35 +0000 (23:07 -0800)
commitac94505ed7295b226580cc0737615f29acdbddf1
tree7a5c5f11e6ea0b22d6dcab5db17e4bf2522cc8ec
parent3ffb204360ca82b813fe715fbc30f9f8e323c6dc
parent6253e8ed477a2a529cd321a7c3d244996fd026fa
Merge changes Ic362b088,I1c65c2aa

* changes:
  vpxenc: find_mismatch/compare_img: normalize types
  vpxenc: cosmetics
vpxenc.c