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)
Change-Id: I9e5c28f898d92091e39f62193f6329b593968819

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

Simple merge
Simple merge