diff options
| author | Johann <johannkoenig@google.com> | 2012-08-02 14:26:04 -0700 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2012-08-02 15:26:24 -0700 |
| commit | 4b0b43632bdb268222b1647771a1cf748235f61e (patch) | |
| tree | 227d3e032b114a618b60ec8465431074d14d5485 /vp8/encoder | |
| parent | 0e17ee56e808891f17da7460c2210c3b14b57f1f (diff) | |
| download | libvpx-4b0b43632bdb268222b1647771a1cf748235f61e.tar libvpx-4b0b43632bdb268222b1647771a1cf748235f61e.tar.gz libvpx-4b0b43632bdb268222b1647771a1cf748235f61e.tar.bz2 libvpx-4b0b43632bdb268222b1647771a1cf748235f61e.zip | |
Pass B_PREDICTION_MODE to intra4x4_predict
Use the correct type when calling and inside the function.
Change-Id: Idbaf1bf58b9574f0cba73d78780e9aedd8889dfd
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/pickinter.c | 4 | ||||
| -rw-r--r-- | vp8/encoder/rdopt.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index 77d9152eb..c9d63c64e 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -151,7 +151,7 @@ static int pick_intra4x4block( unsigned char *yleft = dst - 1; unsigned char top_left = Above[-1]; - for (mode = B_DC_PRED; mode <= B_HE_PRED /*B_HU_PRED*/; mode++) + for (mode = B_DC_PRED; mode <= B_HE_PRED; mode++) { int this_rd; @@ -171,7 +171,7 @@ static int pick_intra4x4block( } } - b->bmi.as_mode = (B_PREDICTION_MODE)(*best_mode); + b->bmi.as_mode = *best_mode; vp8_encode_intra4x4block(x, ib); return best_rd; } diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 005f26213..28d5c1ee8 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -694,7 +694,7 @@ static int rd_pick_intra4x4block( vpx_memcpy(best_dqcoeff, b->dqcoeff, 32); } } - b->bmi.as_mode = (B_PREDICTION_MODE)(*best_mode); + b->bmi.as_mode = *best_mode; vp8_short_idct4x4llm(best_dqcoeff, best_predictor, 16, dst, dst_stride); |