Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Tue, 7 Jun 2011 04:05:06 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Tue, 7 Jun 2011 04:05:07 +0000 (00:05 -0400)
commit6c8205d37eb47c0757f752505ada46bc4079c003
tree77aec2a18c2b9103b6d71ebc7163b5d552534930
parent2c308f36fc0f341eb0be7c5f1cdded13e7d68c2e
parent03973017a7138e196a3e2a8aecf4877780de7fd8
Merge remote branch 'origin/master' into experimental

Change-Id: I67cc3b490266f958a1b3a935ec08ee19d7b4f6a0
vp8/encoder/encodeframe.c
vp8/encoder/firstpass.c
vp8/encoder/generic/csystemdependent.c
vp8/encoder/onyx_if.c