Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Wed, 1 Jun 2011 04:05:13 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Wed, 1 Jun 2011 04:05:13 +0000 (00:05 -0400)
commit2289ba4b9c98ab2f34daaff53f131ff79f5ed59d
treee77d8cb77eb3bc246cd408dca8d6b9017ace8edb
parentd63ce5db34815029159b2ed87e3c6ce65c276662
parent9e4f76c154a355bac2a3e005e47882219801bdae
Merge remote branch 'origin/master' into experimental

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