Merge remote branch 'internal/upstream' into HEAD

author John Koleszar <jkoleszar@google.com>

Wed, 13 Apr 2011 04:05:07 +0000 (00:05 -0400)

committer John Koleszar <jkoleszar@google.com>

Wed, 13 Apr 2011 04:05:07 +0000 (00:05 -0400)
author John Koleszar <jkoleszar@google.com>
Wed, 13 Apr 2011 04:05:07 +0000 (00:05 -0400)
committer John Koleszar <jkoleszar@google.com>
Wed, 13 Apr 2011 04:05:07 +0000 (00:05 -0400)
diff --cc vp8/encoder/encodeframe.c
Simple merge
diff --cc vp8/encoder/encodemb.c
Simple merge
diff --cc vp8/encoder/generic/csystemdependent.c
Simple merge
diff --cc vp8/encoder/onyx_if.c
Simple merge
diff --cc vp8/encoder/rdopt.c
Simple merge
diff --cc vp8/vp8_cx_iface.c
Simple merge
diff --cc vpx/vp8cx.h
Simple merge
author	John Koleszar <jkoleszar@google.com>
	Wed, 13 Apr 2011 04:05:07 +0000 (00:05 -0400)
committer	John Koleszar <jkoleszar@google.com>
	Wed, 13 Apr 2011 04:05:07 +0000 (00:05 -0400)
		1	2
vp8/encoder/encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/encodemb.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/generic/csystemdependent.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/vp8_cx_iface.c	patch \|	diff1 \|	diff2 \|	blob \| history
vpx/vp8cx.h	patch \|	diff1 \|	diff2 \|	blob \| history