diff options
| -rw-r--r-- | libavcodec/rv34.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index cf74eab56f..d0d72c00a0 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -472,26 +472,26 @@ static void rv34_pred_mv(RV34DecContext *r, int block_type, int subblock_no, int int A[2] = {0}, B[2], C[2]; int i, j; int mx, my; - int avail_index = avail_indexes[subblock_no]; + int* avail = r->avail_cache + avail_indexes[subblock_no]; int c_off = part_sizes_w[block_type]; mv_pos += (subblock_no & 1) + (subblock_no >> 1)*s->b8_stride; if(subblock_no == 3) c_off = -1; - if(r->avail_cache[avail_index - 1]){ + if(avail[-1]){ A[0] = s->current_picture_ptr->f.motion_val[0][mv_pos-1][0]; A[1] = s->current_picture_ptr->f.motion_val[0][mv_pos-1][1]; } - if(r->avail_cache[avail_index - 4]){ + if(avail[-4]){ B[0] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride][0]; B[1] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride][1]; }else{ B[0] = A[0]; B[1] = A[1]; } - if(!r->avail_cache[avail_index - 4 + c_off]){ - if(r->avail_cache[avail_index - 4] && (r->avail_cache[avail_index - 1] || r->rv30)){ + if(!avail[c_off-4]){ + if(avail[-4] && (avail[-1] || r->rv30)){ C[0] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride-1][0]; C[1] = s->current_picture_ptr->f.motion_val[0][mv_pos-s->b8_stride-1][1]; }else{ @@ -611,21 +611,21 @@ static void rv34_pred_mv_rv3(RV34DecContext *r, int block_type, int dir) int A[2] = {0}, B[2], C[2]; int i, j, k; int mx, my; - int avail_index = avail_indexes[0]; + int* avail = r->avail_cache + avail_indexes[0]; - if(r->avail_cache[avail_index - 1]){ + if(avail[-1]){ A[0] = s->current_picture_ptr->f.motion_val[0][mv_pos - 1][0]; A[1] = s->current_picture_ptr->f.motion_val[0][mv_pos - 1][1]; } - if(r->avail_cache[avail_index - 4]){ + if(avail[-4]){ B[0] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride][0]; B[1] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride][1]; }else{ B[0] = A[0]; B[1] = A[1]; } - if(!r->avail_cache[avail_index - 4 + 2]){ - if(r->avail_cache[avail_index - 4] && (r->avail_cache[avail_index - 1])){ + if(!avail[-4 + 2]){ + if(avail[-4] && (avail[-1])){ C[0] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride - 1][0]; C[1] = s->current_picture_ptr->f.motion_val[0][mv_pos - s->b8_stride - 1][1]; }else{ |