Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Fri, 3 Jun 2011 04:05:20 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 3 Jun 2011 04:05:21 +0000 (00:05 -0400)
commit480f0257540324b1ffa7579688924a881638cf8a
tree1c1946ddc0e2e3d44b59aad9d94b7b87356058b8
parent32817d6fbe5169413ea05e33bf5a509fcf9f4218
parent4ce6928d5b048ce5f82a97cd3d56267432fdc634
Merge remote branch 'origin/master' into experimental

Change-Id: I7395011ef6c1783110ebd06305ca3d908d2457bb
vp8/encoder/firstpass.c
vp8/encoder/rdopt.c