ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Thu Feb 16 12:28:42 2017 +0100| [8365c1a15c9457a193fde87c3425e533569ffd79] | committer: Michael Niedermayer
avcodec/error_resilience: Fix "assignment from incompatible pointer type" warning Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8365c1a15c9457a193fde87c3425e533569ffd79 --- libavcodec/error_resilience.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 3dbcb53..de612d1 100644 --- a/libavcodec/error_resilience.c +++ b/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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
