Merge "Move diff to MACROBLOCKD per-plane data." into experimental
authorJohn Koleszar <jkoleszar@google.com>
Fri, 19 Apr 2013 19:04:23 +0000 (12:04 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 19 Apr 2013 19:04:23 +0000 (12:04 -0700)

Trivial merge