Merge remote branch 'internal/upstream' into HEAD

author John Koleszar <jkoleszar@google.com>

Thu, 23 Jun 2011 15:55:51 +0000 (11:55 -0400)

committer John Koleszar <jkoleszar@google.com>

Thu, 23 Jun 2011 15:55:51 +0000 (11:55 -0400)
author John Koleszar <jkoleszar@google.com>
Thu, 23 Jun 2011 15:55:51 +0000 (11:55 -0400)
committer John Koleszar <jkoleszar@google.com>
Thu, 23 Jun 2011 15:55:51 +0000 (11:55 -0400)
diff --cc vp8/encoder/firstpass.c
Simple merge
diff --cc vp8/encoder/onyx_if.c
Simple merge
diff --cc vp8/encoder/onyx_int.h
Simple merge
diff --cc vp8/encoder/ratectrl.c
Simple merge
diff --cc vpxenc.c
Simple merge
author	John Koleszar <jkoleszar@google.com>
	Thu, 23 Jun 2011 15:55:51 +0000 (11:55 -0400)
committer	John Koleszar <jkoleszar@google.com>
	Thu, 23 Jun 2011 15:55:51 +0000 (11:55 -0400)
		1	2
vp8/encoder/firstpass.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/onyx_int.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/ratectrl.c	patch \|	diff1 \|	diff2 \|	blob \| history
vpxenc.c	patch \|	diff1 \|	diff2 \|	blob \| history