Merge "Remove avoid_frame_with_high_error from RD loop"

author Jingning Han <jingning@google.com>

Tue, 7 Jan 2014 17:31:17 +0000 (09:31 -0800)

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

Tue, 7 Jan 2014 17:31:17 +0000 (09:31 -0800)
author Jingning Han <jingning@google.com>
Tue, 7 Jan 2014 17:31:17 +0000 (09:31 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 7 Jan 2014 17:31:17 +0000 (09:31 -0800)
diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge
diff --cc vp9/encoder/vp9_onyx_int.h
Simple merge
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
author	Jingning Han <jingning@google.com>
	Tue, 7 Jan 2014 17:31:17 +0000 (09:31 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Tue, 7 Jan 2014 17:31:17 +0000 (09:31 -0800)
		1	2
vp9/encoder/vp9_onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_onyx_int.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history