summaryrefslogtreecommitdiff
path: root/libavcodec/error_resilience.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-02-16 12:28:42 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-02-16 13:20:27 +0100
commit8365c1a15c9457a193fde87c3425e533569ffd79 (patch)
tree8ee9cbd88acdd4e08f6a10b13395256ede219640 /libavcodec/error_resilience.c
parente3f1b993341ec9ed542b07c4558baeea6921ed53 (diff)
downloadffmpeg-8365c1a15c9457a193fde87c3425e533569ffd79.tar.gz
avcodec/error_resilience: Fix "assignment from incompatible pointer type" warning
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/error_resilience.c')
-rw-r--r--libavcodec/error_resilience.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 3dbcb53b08..de612d1973 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);