Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Sat, 4 Jun 2011 04:05:13 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Sat, 4 Jun 2011 04:05:13 +0000 (00:05 -0400)
commit2c308f36fc0f341eb0be7c5f1cdded13e7d68c2e
treeaa05dfa619c1a080efde228efd5d021158d65aa7
parent480f0257540324b1ffa7579688924a881638cf8a
parent8c5b73de2a3534b2ca964e33b33474c1fd6fb488
Merge remote branch 'origin/master' into experimental

Change-Id: I81ac427cbaf3d0865df4acef3e0bfc2e95556c4b
vp8/encoder/encodeframe.c
vp8/encoder/firstpass.c
vp8/encoder/rdopt.c