Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Sat, 5 Feb 2011 05:05:11 +0000 (00:05 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Sat, 5 Feb 2011 05:05:11 +0000 (00:05 -0500)
commit318a14c637e3ec91d3ee9541a0ed527106947203
treeedc1134108c96c499af75403d803034e231d7f18
parent16bbf27fa95c7591d7ff0a8c3d242fd81b40fa12
parent350ffe8dae8e11fb4d00b00c467c1c99ca797f8b
Merge remote branch 'origin/master' into experimental

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