Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Fri, 13 May 2011 04:05:14 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 13 May 2011 04:05:14 +0000 (00:05 -0400)
commit71a0eaf33ccd7437c129a91d4e3ff829551bef1f
treef0c10ddca4e53ce68f3d969a34fb850f75a79fcd
parent5c849a64d97dd30b2d7e472bd75412dd1897bafd
parent71a7501bcf6ada5068d102c03ae597023e986538
Merge remote branch 'origin/master' into experimental

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