Merge "Add vp9_ prefix to mv_pred and setup_pred_block functions"

author Jingning Han <jingning@google.com>

Wed, 25 Jun 2014 15:57:08 +0000 (08:57 -0700)

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

Wed, 25 Jun 2014 15:57:08 +0000 (08:57 -0700)
author Jingning Han <jingning@google.com>
Wed, 25 Jun 2014 15:57:08 +0000 (08:57 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 25 Jun 2014 15:57:08 +0000 (08:57 -0700)
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
diff --cc vp9/encoder/vp9_rdopt.h
Simple merge
author	Jingning Han <jingning@google.com>
	Wed, 25 Jun 2014 15:57:08 +0000 (08:57 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Wed, 25 Jun 2014 15:57:08 +0000 (08:57 -0700)
		1	2
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_rdopt.h	patch \|	diff1 \|	diff2 \|	blob \| history