avcodec/error_resilience: Fix "assignment from incompatible pointer type" warning

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
pull/148/merge
Michael Niedermayer 8 years ago
parent e3f1b99334
commit 8365c1a15c
  1. 6
      libavcodec/error_resilience.c

@ -402,9 +402,9 @@ static void guess_mv(ERContext *s)
if (s->next_pic.f && s->next_pic.f->data[0])
mb_height = FFMIN(mb_height, (s->next_pic.f->height+15)>>4);
blocklist = s->er_temp_buffer;
next_blocklist = (s->er_temp_buffer + 2 * sizeof(int) * s->mb_stride * s->mb_height);
fixed = s->er_temp_buffer + 4 * sizeof(int) * s->mb_stride * s->mb_height;
blocklist = (int (*)[2])s->er_temp_buffer;
next_blocklist = blocklist + s->mb_stride * s->mb_height;
fixed = (uint8_t *)(next_blocklist + s->mb_stride * s->mb_height);
set_mv_strides(s, &mot_step, &mot_stride);

Loading…
Cancel
Save