Merge "Adding DEFAULT_PRED_PROB_{0, 1, 2} constants." into experimental

author Dmitry Kovalev <dkovalev@google.com>

Thu, 18 Apr 2013 21:39:14 +0000 (14:39 -0700)

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

Thu, 18 Apr 2013 21:39:14 +0000 (14:39 -0700)
author Dmitry Kovalev <dkovalev@google.com>
Thu, 18 Apr 2013 21:39:14 +0000 (14:39 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 18 Apr 2013 21:39:14 +0000 (14:39 -0700)
diff --cc vp9/common/vp9_blockd.h
Simple merge
diff --cc vp9/common/vp9_entropymode.c
Simple merge
diff --cc vp9/decoder/vp9_decodframe.c
Simple merge
author	Dmitry Kovalev <dkovalev@google.com>
	Thu, 18 Apr 2013 21:39:14 +0000 (14:39 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Thu, 18 Apr 2013 21:39:14 +0000 (14:39 -0700)
		1	2
vp9/common/vp9_blockd.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/common/vp9_entropymode.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/decoder/vp9_decodframe.c	patch \|	diff1 \|	diff2 \|	blob \| history