Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Mon, 16 May 2011 13:11:18 +0000 (09:11 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Mon, 16 May 2011 13:11:37 +0000 (09:11 -0400)
Conflicts:
vp8/encoder/rdopt.c

Change-Id: I85275aab07625bd30bbef16a752b08b18f4451ab

1  2 
vp8/encoder/encodeframe.c
vp8/encoder/onyx_if.c

Simple merge
Simple merge