Merge "Uncompressed header: new encoding for frame size" into experimental

author Dmitry Kovalev <dkovalev@google.com>

Sat, 8 Jun 2013 01:22:53 +0000 (18:22 -0700)

committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>

Sat, 8 Jun 2013 01:22:53 +0000 (18:22 -0700)
author Dmitry Kovalev <dkovalev@google.com>
Sat, 8 Jun 2013 01:22:53 +0000 (18:22 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Sat, 8 Jun 2013 01:22:53 +0000 (18:22 -0700)
diff --cc vp9/decoder/vp9_decodframe.c
Simple merge
diff --cc vp9/encoder/vp9_bitstream.c
Simple merge
author	Dmitry Kovalev <dkovalev@google.com>
	Sat, 8 Jun 2013 01:22:53 +0000 (18:22 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Sat, 8 Jun 2013 01:22:53 +0000 (18:22 -0700)
		1	2
vp9/decoder/vp9_decodframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_bitstream.c	patch \|	diff1 \|	diff2 \|	blob \| history