diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-14 08:48:32 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-14 08:48:44 -0400 |
| commit | eeb8c8004e8d9400609e328db1ae7ca652e532cc (patch) | |
| tree | 06f66a6b2de8c319dea699dabfea4cefbe7d2aa3 /vp8/encoder/encodeframe.c | |
| parent | 314631ca6142a38507ee683ed03be1a504a03753 (diff) | |
| parent | 3788b3564c587983a10d7131b35c0d9c39540666 (diff) | |
| download | libvpx-eeb8c8004e8d9400609e328db1ae7ca652e532cc.tar libvpx-eeb8c8004e8d9400609e328db1ae7ca652e532cc.tar.gz libvpx-eeb8c8004e8d9400609e328db1ae7ca652e532cc.tar.bz2 libvpx-eeb8c8004e8d9400609e328db1ae7ca652e532cc.zip | |
Merge remote branch 'origin/master' into experimental
Conflicts:
vp8/encoder/onyx_if.c
Change-Id: I230b63cef209cd1ac98357729a91ec07597756bd
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 58e36acdb..add874092 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -1184,7 +1184,8 @@ int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t) int distortion2; x->e_mbd.mode_info_context->mbmi.mode = mode; - vp8_build_intra_predictors_mby_ptr(&x->e_mbd); + RECON_INVOKE(&cpi->common.rtcd.recon, build_intra_predictors_mby) + (&x->e_mbd); distortion2 = VARIANCE_INVOKE(&cpi->rtcd.variance, get16x16prederror)(x->src.y_buffer, x->src.y_stride, x->e_mbd.predictor, 16, 0x7fffffff); rate2 = x->mbmode_cost[x->e_mbd.frame_type][mode]; this_rd = RD_ESTIMATE(x->rdmult, x->rddiv, rate2, distortion2); |