Merge "Relocated idct/add calls for encoder"
authorScott LaVarnway <slavarnway@google.com>
Wed, 9 Nov 2011 18:17:43 +0000 (10:17 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 9 Nov 2011 18:17:43 +0000 (10:17 -0800)
1  2 
vp8/encoder/encodeframe.c
vp8/encoder/encodeintra.c

Simple merge
Simple merge