Merge "Consistently use get_prob(), clip_prob() and newly added clip_pixel()." into...

author Ronald S. Bultje <rbultje@google.com>

Wed, 12 Dec 2012 18:34:14 +0000 (10:34 -0800)

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

Wed, 12 Dec 2012 18:34:14 +0000 (10:34 -0800)
author Ronald S. Bultje <rbultje@google.com>
Wed, 12 Dec 2012 18:34:14 +0000 (10:34 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 12 Dec 2012 18:34:14 +0000 (10:34 -0800)
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
diff --cc vp9/encoder/vp9_tokenize.c
Simple merge
author	Ronald S. Bultje <rbultje@google.com>
	Wed, 12 Dec 2012 18:34:14 +0000 (10:34 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Wed, 12 Dec 2012 18:34:14 +0000 (10:34 -0800)
		1	2
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_tokenize.c	patch \|	diff1 \|	diff2 \|	blob \| history