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)
commit11b9b14691609e53a65f04c076d4191c78d115c6
tree14cf6e221bdc655006e402e9d5b352c07341f9e5
parent71a0eaf33ccd7437c129a91d4e3ff829551bef1f
parenteafdc5e10acd025e3587ee56bfa90894eb52d5ba
Merge remote branch 'origin/master' into experimental

Conflicts:
vp8/encoder/rdopt.c

Change-Id: I85275aab07625bd30bbef16a752b08b18f4451ab
vp8/encoder/encodeframe.c
vp8/encoder/onyx_if.c