Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Sat, 19 Feb 2011 05:05:10 +0000 (00:05 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Sat, 19 Feb 2011 05:05:11 +0000 (00:05 -0500)
commitbbfca323fbc7b4ee5c94fc911af9527c31d194f5
treefa14fb5e3aa66942ab884daae8ab3887f09e7ca7
parent4fafc4d985debd3e9ec41b1c0ab447e32d2a9db9
parent945dad277d3c09708956d60bf7844d47e0eeed1f
Merge remote branch 'origin/master' into experimental

Change-Id: Ia3197f432b424213a34b20071e5171a413ba1aaf
vp8/common/alloccommon.c
vp8/encoder/onyx_if.c