Merge "Fixing member names inside TOKENVALUE and TOKENEXTRA structs." into experimental

author Dmitry Kovalev <dkovalev@google.com>

Fri, 19 Apr 2013 17:09:04 +0000 (10:09 -0700)

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

Fri, 19 Apr 2013 17:09:04 +0000 (10:09 -0700)
author Dmitry Kovalev <dkovalev@google.com>
Fri, 19 Apr 2013 17:09:04 +0000 (10:09 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 19 Apr 2013 17:09:04 +0000 (10:09 -0700)
diff --cc vp9/encoder/vp9_bitstream.c
Simple merge
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
author	Dmitry Kovalev <dkovalev@google.com>
	Fri, 19 Apr 2013 17:09:04 +0000 (10:09 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Fri, 19 Apr 2013 17:09:04 +0000 (10:09 -0700)
		1	2
vp9/encoder/vp9_bitstream.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history