Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Thu, 2 Jun 2011 04:05:12 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 2 Jun 2011 04:05:13 +0000 (00:05 -0400)
commit32817d6fbe5169413ea05e33bf5a509fcf9f4218
tree283a0c34c08897378cb3e8ea60f173e0d1a11838
parent2289ba4b9c98ab2f34daaff53f131ff79f5ed59d
parent4101b5c5edf3f1257f8f9870dc16ccd49df22708
Merge remote branch 'origin/master' into experimental

Change-Id: I993dbef81ca3d1638e16c4134aa8dc177e57875c
vp8/encoder/onyx_if.c
vp8/encoder/rdopt.c