Merge "Adding get_scan_{4x4, 8x8, 16x16} functions." into experimental

author Dmitry Kovalev <dkovalev@google.com>

Tue, 23 Apr 2013 19:44:51 +0000 (12:44 -0700)

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

Tue, 23 Apr 2013 19:44:51 +0000 (12:44 -0700)
author Dmitry Kovalev <dkovalev@google.com>
Tue, 23 Apr 2013 19:44:51 +0000 (12:44 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 23 Apr 2013 19:44:51 +0000 (12:44 -0700)
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
diff --cc vp9/encoder/vp9_tokenize.c
Simple merge
author	Dmitry Kovalev <dkovalev@google.com>
	Tue, 23 Apr 2013 19:44:51 +0000 (12:44 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Tue, 23 Apr 2013 19:44:51 +0000 (12:44 -0700)
		1	2
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_tokenize.c	patch \|	diff1 \|	diff2 \|	blob \| history