Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Tue, 24 May 2011 04:05:10 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Tue, 24 May 2011 04:05:10 +0000 (00:05 -0400)
commitb9f98a52c8c63b6d49ce4aee03ac4a00c50fe28d
tree39e11e651e3c8202c6cf87022823675667438472
parent4d240d1eae9fc88278a358a075735b84f8da89e2
parent99fb568e67429e0cffa8c2392fcf1dcfb1a4ee2b
Merge remote branch 'origin/master' into experimental

Change-Id: I56a5665a5d4e2ed590d75a5ad49e8feb54393f6e
vp8/encoder/rdopt.c