Merge "Removing lossless field from VP9EncoderConfig."

author Dmitry Kovalev <dkovalev@google.com>

Tue, 3 Jun 2014 23:46:22 +0000 (16:46 -0700)

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

Tue, 3 Jun 2014 23:46:22 +0000 (16:46 -0700)
author Dmitry Kovalev <dkovalev@google.com>
Tue, 3 Jun 2014 23:46:22 +0000 (16:46 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 3 Jun 2014 23:46:22 +0000 (16:46 -0700)
diff --cc vp9/encoder/vp9_encoder.c
Simple merge
diff --cc vp9/encoder/vp9_encoder.h
Simple merge
diff --cc vp9/vp9_cx_iface.c
Simple merge
author	Dmitry Kovalev <dkovalev@google.com>
	Tue, 3 Jun 2014 23:46:22 +0000 (16:46 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Tue, 3 Jun 2014 23:46:22 +0000 (16:46 -0700)
		1	2
vp9/encoder/vp9_encoder.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_encoder.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/vp9_cx_iface.c	patch \|	diff1 \|	diff2 \|	blob \| history