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)
commit6612a43ce299b16600457d5aef388378afbec192
tree3da779a21a14c6bb4c4af244018e31b77ff03a12
parent978e4d0445d46a5b1d2657a50d66d8f138f839b6
parentfb44d3e1da2982fef17cca17bd6c421e98273087
Merge changes I96cd08c9,If8eeb8ff into experimental

* changes:
  hybridtransform8x8: fix compilation
  comp_intra_pred: fix compilation