diff options
Diffstat (limited to 'vp8/encoder/bitstream.c')
-rw-r--r-- | vp8/encoder/bitstream.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c index 21629841b..c706395a8 100644 --- a/vp8/encoder/bitstream.c +++ b/vp8/encoder/bitstream.c @@ -872,6 +872,8 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) int prob_skip_false = 0; ms = pc->mi - 1; + cpi->mb.partition_info = cpi->mb.pi; + // Calculate the probabilities to be used to code the reference frame based on actual useage this frame if (!(cpi->prob_intra_coded = rf_intra * 255 / (rf_intra + rf_inter))) cpi->prob_intra_coded = 1; @@ -1020,7 +1022,7 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) do { - const B_MODE_INFO *const b = mi->partition_bmi + j; + const B_MODE_INFO *const b = cpi->mb.partition_info->bmi + j; const int *const L = vp8_mbsplits [mi->partitioning]; int k = -1; /* first block in subset j */ int mv_contz; @@ -1042,7 +1044,7 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) write_mv(w, &b->mv.as_mv, &best_mv, (const MV_CONTEXT *) mvc); } } - while (++j < mi->partition_count); + while (++j < cpi->mb.partition_info->count); } break; default: @@ -1051,9 +1053,11 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) } ++m; + cpi->mb.partition_info++; } ++m; /* skip L prediction border */ + cpi->mb.partition_info++; } } |