Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Thu, 19 May 2011 04:05:12 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 19 May 2011 04:05:12 +0000 (00:05 -0400)
commita741e0e3cb63e3e4b398c8c275fd909836ec8074
tree5d942234abf6f5faffa6389c43c7afebaa713896
parent11b9b14691609e53a65f04c076d4191c78d115c6
parent00a1e2f8e4878f59c95f017f4cdbc80ada07a487
Merge remote branch 'origin/master' into experimental

Change-Id: I2f9fd68d7fd52e0aebc57e561c77ebe99e9c33e4
vp8/encoder/encodeframe.c
vp8/encoder/rdopt.c