Merge changes Ic362b088,I1c65c2aa

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