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)
Change-Id: I56a5665a5d4e2ed590d75a5ad49e8feb54393f6e

1  2 
vp8/encoder/rdopt.c

Simple merge