From 0edbe6faa7ef80daf0e84353cbe733389bf1a522 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 17 Jan 2015 22:28:46 +0100 Subject: h264: move mb_xy into the per-slice context --- libavcodec/h264_direct.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/h264_direct.c') diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 67d9faea78..136d8fa25e 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -179,7 +179,7 @@ static void pred_spatial_direct_motion(H264Context *const h, H264SliceContext *s { int b8_stride = 2; int b4_stride = h->b_stride; - int mb_xy = h->mb_xy, mb_y = h->mb_y; + int mb_xy = sl->mb_xy, mb_y = h->mb_y; int mb_type_col[2]; const int16_t (*l1mv0)[2], (*l1mv1)[2]; const int8_t *l1ref0, *l1ref1; @@ -465,7 +465,7 @@ static void pred_temp_direct_motion(H264Context *const h, H264SliceContext *sl, { int b8_stride = 2; int b4_stride = h->b_stride; - int mb_xy = h->mb_xy, mb_y = h->mb_y; + int mb_xy = sl->mb_xy, mb_y = h->mb_y; int mb_type_col[2]; const int16_t (*l1mv0)[2], (*l1mv1)[2]; const int8_t *l1ref0, *l1ref1; -- cgit v1.2.3