Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Sat, 28 May 2011 04:05:12 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Sat, 28 May 2011 04:05:12 +0000 (00:05 -0400)
commitd63ce5db34815029159b2ed87e3c6ce65c276662
treecc0d8f4cc4e68303683a7b097c5169237c6cce16
parent2fa7fe66c41b85b71d74d14a64bf731673f8bc10
parent4a4ade6dc8d6b4af4848c830a359b4a0fc81d1a5
Merge remote branch 'origin/master' into experimental

Change-Id: Ie2a4927754a9c220b30a84fc7e1372e565fe9eec
vp8/encoder/onyx_if.c
vp8/encoder/rdopt.c