Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Fri, 11 Mar 2011 05:05:07 +0000 (00:05 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 11 Mar 2011 05:05:07 +0000 (00:05 -0500)
1  2 
vp8/encoder/firstpass.c
vp8/encoder/onyx_if.c
vp8/encoder/onyx_int.h
vp8/vp8_cx_iface.c

Simple merge
Simple merge
Simple merge
Simple merge