Merge commit 'fix integer promotion bug in partition size check'

author John Koleszar <jkoleszar@google.com>

Fri, 5 Nov 2010 20:49:17 +0000 (16:49 -0400)

committer John Koleszar <jkoleszar@google.com>

Fri, 5 Nov 2010 20:49:32 +0000 (16:49 -0400)
author John Koleszar <jkoleszar@google.com>
Fri, 5 Nov 2010 20:49:17 +0000 (16:49 -0400)
committer John Koleszar <jkoleszar@google.com>
Fri, 5 Nov 2010 20:49:32 +0000 (16:49 -0400)
diff --cc vp8/decoder/decodframe.c
Simple merge
diff --cc vp8/vp8_dx_iface.c
Simple merge
author	John Koleszar <jkoleszar@google.com>
	Fri, 5 Nov 2010 20:49:17 +0000 (16:49 -0400)
committer	John Koleszar <jkoleszar@google.com>
	Fri, 5 Nov 2010 20:49:32 +0000 (16:49 -0400)
		1	2
vp8/decoder/decodframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/vp8_dx_iface.c	patch \|	diff1 \|	diff2 \|	blob \| history