]> granicus.if.org Git - libvpx/commit
Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Mon, 14 Mar 2011 12:48:32 +0000 (08:48 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Mon, 14 Mar 2011 12:48:44 +0000 (08:48 -0400)
commiteeb8c8004e8d9400609e328db1ae7ca652e532cc
tree06f66a6b2de8c319dea699dabfea4cefbe7d2aa3
parent314631ca6142a38507ee683ed03be1a504a03753
parent3788b3564c587983a10d7131b35c0d9c39540666
Merge remote branch 'origin/master' into experimental

Conflicts:
vp8/encoder/onyx_if.c

Change-Id: I230b63cef209cd1ac98357729a91ec07597756bd
vp8/common/generic/systemdependent.c
vp8/encoder/encodeframe.c
vp8/encoder/firstpass.c
vp8/encoder/generic/csystemdependent.c
vp8/encoder/onyx_if.c
vp8/encoder/ratectrl.c
vp8/encoder/rdopt.c