diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-04-28 00:05:07 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-04-28 00:05:07 -0400 |
| commit | e1b90ce862b6989d8ad755ffbbd9d59849d93a4f (patch) | |
| tree | e4517530e46531457dbc37df11edeb5bb75b7921 /vp8/encoder/pickinter.c | |
| parent | 9d325df746cd79f434cea45768b38dc49b61e3aa (diff) | |
| parent | 2e102855f4f69148d17771f584c26e1498ec82e2 (diff) | |
| download | libvpx-e1b90ce862b6989d8ad755ffbbd9d59849d93a4f.tar libvpx-e1b90ce862b6989d8ad755ffbbd9d59849d93a4f.tar.gz libvpx-e1b90ce862b6989d8ad755ffbbd9d59849d93a4f.tar.bz2 libvpx-e1b90ce862b6989d8ad755ffbbd9d59849d93a4f.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder/pickinter.c')
| -rw-r--r-- | vp8/encoder/pickinter.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index 765ff26f6..ea4f01fad 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -194,7 +194,8 @@ static int pick_intra4x4block( int this_rd; rate = mode_costs[mode]; - vp8_predict_intra4x4(b, mode, b->predictor); + RECON_INVOKE(&rtcd->common->recon, intra4x4_predict) + (b, mode, b->predictor); distortion = get_prediction_error(be, b, &rtcd->variance); this_rd = RDCOST(x->rdmult, x->rddiv, rate, distortion); |