Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Thu, 26 May 2011 04:05:13 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 26 May 2011 04:05:13 +0000 (00:05 -0400)
commit26fd970b154f77fcc8eabbcf035c18558bb191cb
treef37fca442cb20d8b937e0d3e1a8e1a43d86ab377
parent117fcb207e2e655cd334b6a8522af7d713b1fcee
parent13b56eeb7a6a61c599c397a3b8cd5b6f77c2f07b
Merge remote branch 'origin/master' into experimental

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