Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Sat, 4 Jun 2011 04:05:13 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Sat, 4 Jun 2011 04:05:13 +0000 (00:05 -0400)
Change-Id: I81ac427cbaf3d0865df4acef3e0bfc2e95556c4b

1  2 
vp8/encoder/encodeframe.c
vp8/encoder/firstpass.c
vp8/encoder/rdopt.c

Simple merge
Simple merge
Simple merge