Merge "Removed shadow warnings : bitstream.c encodeframe.c onyx_if.c"

author Scott LaVarnway <slavarnway@google.com>

Fri, 19 Apr 2013 14:08:59 +0000 (07:08 -0700)

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

Fri, 19 Apr 2013 14:08:59 +0000 (07:08 -0700)
author Scott LaVarnway <slavarnway@google.com>
Fri, 19 Apr 2013 14:08:59 +0000 (07:08 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 19 Apr 2013 14:08:59 +0000 (07:08 -0700)
diff --cc vp8/encoder/bitstream.c
Simple merge
diff --cc vp8/encoder/encodeframe.c
Simple merge
diff --cc vp8/encoder/onyx_if.c
Simple merge
author	Scott LaVarnway <slavarnway@google.com>
	Fri, 19 Apr 2013 14:08:59 +0000 (07:08 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Fri, 19 Apr 2013 14:08:59 +0000 (07:08 -0700)
		1	2
vp8/encoder/bitstream.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history