Commit 20be5108 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/vc1dec: remove blocks_off use from vc1_pred_b_mv()

it should always be 0
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 41f97420
...@@ -2127,10 +2127,10 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], ...@@ -2127,10 +2127,10 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2],
xy = s->block_index[0]; xy = s->block_index[0];
if (s->mb_intra) { if (s->mb_intra) {
s->current_picture.motion_val[0][xy + v->blocks_off][0] = s->current_picture.motion_val[0][xy][0] =
s->current_picture.motion_val[0][xy + v->blocks_off][1] = s->current_picture.motion_val[0][xy][1] =
s->current_picture.motion_val[1][xy + v->blocks_off][0] = s->current_picture.motion_val[1][xy][0] =
s->current_picture.motion_val[1][xy + v->blocks_off][1] = 0; s->current_picture.motion_val[1][xy][1] = 0;
return; return;
} }
if (direct && s->next_picture_ptr->field_picture) if (direct && s->next_picture_ptr->field_picture)
...@@ -2147,10 +2147,10 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], ...@@ -2147,10 +2147,10 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2],
s->mv[1][0][0] = av_clip(s->mv[1][0][0], -60 - (s->mb_x << 6), (s->mb_width << 6) - 4 - (s->mb_x << 6)); s->mv[1][0][0] = av_clip(s->mv[1][0][0], -60 - (s->mb_x << 6), (s->mb_width << 6) - 4 - (s->mb_x << 6));
s->mv[1][0][1] = av_clip(s->mv[1][0][1], -60 - (s->mb_y << 6), (s->mb_height << 6) - 4 - (s->mb_y << 6)); s->mv[1][0][1] = av_clip(s->mv[1][0][1], -60 - (s->mb_y << 6), (s->mb_height << 6) - 4 - (s->mb_y << 6));
if (direct) { if (direct) {
s->current_picture.motion_val[0][xy + v->blocks_off][0] = s->mv[0][0][0]; s->current_picture.motion_val[0][xy][0] = s->mv[0][0][0];
s->current_picture.motion_val[0][xy + v->blocks_off][1] = s->mv[0][0][1]; s->current_picture.motion_val[0][xy][1] = s->mv[0][0][1];
s->current_picture.motion_val[1][xy + v->blocks_off][0] = s->mv[1][0][0]; s->current_picture.motion_val[1][xy][0] = s->mv[1][0][0];
s->current_picture.motion_val[1][xy + v->blocks_off][1] = s->mv[1][0][1]; s->current_picture.motion_val[1][xy][1] = s->mv[1][0][1];
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment