Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Thu, 3 Mar 2011 13:59:34 +0000 (08:59 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 3 Mar 2011 13:59:34 +0000 (08:59 -0500)
commitca29f6a7c47471621da52e96cb2d5c5acb81b41b
tree57b2392bc6fcb2f7b49f90cb05043da8edcbf6e2
parent738a79191725f5af4a08451312f5a48fb386bc4b
parent6f5189c044cf52171822f6df1ad6ae4a3bcaf2c4
Merge remote branch 'internal/upstream' into HEAD

Conflicts:
vp8/vp8_cx_iface.c

Change-Id: Iecfd4532ab1c722d10ecce8a5ec473e96093cf3b
vp8/encoder/generic/csystemdependent.c
vp8/encoder/onyx_if.c
vp8/encoder/onyx_int.h
vp8/vp8_cx_iface.c