Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Fri, 10 Sep 2010 04:05:04 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 10 Sep 2010 04:05:04 +0000 (00:05 -0400)
1  2 
ivfenc.c
vp8/common/alloccommon.c
vp8/common/onyxc_int.h
vp8/vp8_cx_iface.c
vpx/vp8cx.h

diff --cc ivfenc.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc vpx/vp8cx.h
Simple merge