Merge "Using enums instead of integers."

author Dmitry Kovalev <dkovalev@google.com>

Tue, 11 Mar 2014 03:50:58 +0000 (20:50 -0700)

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

Tue, 11 Mar 2014 03:50:58 +0000 (20:50 -0700)
author Dmitry Kovalev <dkovalev@google.com>
Tue, 11 Mar 2014 03:50:58 +0000 (20:50 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 11 Mar 2014 03:50:58 +0000 (20:50 -0700)
diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge
diff --cc vp9/encoder/vp9_onyx_int.h
Simple merge
author	Dmitry Kovalev <dkovalev@google.com>
	Tue, 11 Mar 2014 03:50:58 +0000 (20:50 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Tue, 11 Mar 2014 03:50:58 +0000 (20:50 -0700)
		1	2
vp9/encoder/vp9_onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_onyx_int.h	patch \|	diff1 \|	diff2 \|	blob \| history