Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Sat, 21 May 2011 04:05:14 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Sat, 21 May 2011 04:05:14 +0000 (00:05 -0400)
commit4d240d1eae9fc88278a358a075735b84f8da89e2
treee3f79482b16237981269b413da7787885dde56e6
parent54bc4fde77f0c3ed42907d3c86ecc51cf8cddc80
parentad6fe4a88c9d051a34c85d3f422cde5819f2bbdf
Merge remote branch 'origin/master' into experimental

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