Merge changes I96cd08c9,If8eeb8ff into experimental
authorJohn Koleszar <jkoleszar@google.com>
Tue, 21 Aug 2012 17:10:43 +0000 (10:10 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 21 Aug 2012 17:10:43 +0000 (10:10 -0700)
* changes:
  hybridtransform8x8: fix compilation
  comp_intra_pred: fix compilation


Trivial merge