Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Wed, 25 May 2011 04:05:14 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Wed, 25 May 2011 04:05:14 +0000 (00:05 -0400)
commit117fcb207e2e655cd334b6a8522af7d713b1fcee
tree245a1d5901f6c295d41414ed12a437cd9e04d840
parentb9f98a52c8c63b6d49ce4aee03ac4a00c50fe28d
parentd75eb7365357ec45626452756308d4327fa66911
Merge remote branch 'origin/master' into experimental

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