ref: 08d86bc9043f55d86f20f4bab74bc4ca949b3a4c
parent: 98492c1091d50933d2cd659cffe14d40cad46cbb
parent: 5e935126a66aa9cbb0008310ca05500f3eec8269
author: Paul Wilkins <paulwilkins@google.com>
date: Fri Nov 7 04:22:12 EST 2014
Merge "Add intra complexity and brightness weight to first pass."