Merge "Removed shadow warnings : bitstream.c encodeframe.c onyx_if.c"
authorScott LaVarnway <slavarnway@google.com>
Fri, 19 Apr 2013 14:08:59 +0000 (07:08 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 19 Apr 2013 14:08:59 +0000 (07:08 -0700)
1  2 
vp8/encoder/bitstream.c
vp8/encoder/encodeframe.c
vp8/encoder/onyx_if.c

Simple merge
Simple merge
Simple merge