Merge "Segment Skip Flag" into experimental

author Paul Wilkins <paulwilkins@google.com>

Tue, 29 Jan 2013 17:29:26 +0000 (09:29 -0800)

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

Tue, 29 Jan 2013 17:29:26 +0000 (09:29 -0800)
author Paul Wilkins <paulwilkins@google.com>
Tue, 29 Jan 2013 17:29:26 +0000 (09:29 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 29 Jan 2013 17:29:26 +0000 (09:29 -0800)
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
author	Paul Wilkins <paulwilkins@google.com>
	Tue, 29 Jan 2013 17:29:26 +0000 (09:29 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Tue, 29 Jan 2013 17:29:26 +0000 (09:29 -0800)
		1	2
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history