diff options
| author | Johann <johannkoenig@google.com> | 2012-08-01 11:17:57 -0700 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2012-08-01 11:17:57 -0700 |
| commit | a497cb59cd510c053f275d30f4d7e04edc8c8b18 (patch) | |
| tree | e09e44c88a9660603c8d487326dcb4f4cef3a95a /vp8/encoder/pickinter.c | |
| parent | 41aede61e907d89d6b878b70d1f89a9687368af5 (diff) | |
| download | libvpx-a497cb59cd510c053f275d30f4d7e04edc8c8b18.tar libvpx-a497cb59cd510c053f275d30f4d7e04edc8c8b18.tar.gz libvpx-a497cb59cd510c053f275d30f4d7e04edc8c8b18.tar.bz2 libvpx-a497cb59cd510c053f275d30f4d7e04edc8c8b18.zip | |
Rename vp8_intra4x4_predict_d
predict_d has become canonical. Remove previous helper function.
Disable ARM assembly pending update.
Change-Id: Idd84ac8a28f9b0221ea97904a77de1e705d06a7d
Diffstat (limited to 'vp8/encoder/pickinter.c')
| -rw-r--r-- | vp8/encoder/pickinter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index 4d4bbea0f..77d9152eb 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -157,8 +157,8 @@ static int pick_intra4x4block( rate = mode_costs[mode]; - vp8_intra4x4_predict_d(Above, yleft, dst_stride, mode, - b->predictor, 16, top_left); + vp8_intra4x4_predict(Above, yleft, dst_stride, mode, + b->predictor, 16, top_left); distortion = get_prediction_error(be, b); this_rd = RDCOST(x->rdmult, x->rddiv, rate, distortion); |