Merge "Deprecate 4x4 intra modes from bit-stream" into experimental

author Jingning Han <jingning@google.com>

Tue, 21 May 2013 22:59:58 +0000 (15:59 -0700)

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

Tue, 21 May 2013 22:59:58 +0000 (15:59 -0700)
author Jingning Han <jingning@google.com>
Tue, 21 May 2013 22:59:58 +0000 (15:59 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 21 May 2013 22:59:58 +0000 (15:59 -0700)
diff --cc vp9/decoder/vp9_decodemv.c
Simple merge
diff --cc vp9/encoder/vp9_bitstream.c
Simple merge
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
author	Jingning Han <jingning@google.com>
	Tue, 21 May 2013 22:59:58 +0000 (15:59 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Tue, 21 May 2013 22:59:58 +0000 (15:59 -0700)
		1	2
vp9/decoder/vp9_decodemv.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_bitstream.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history