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_mc_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/h264_mc_template.c') diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c index beee7111ed..575320a301 100644 --- a/libavcodec/h264_mc_template.c +++ b/libavcodec/h264_mc_template.c @@ -71,7 +71,7 @@ static void MCFUNC(hl_motion)(H264Context *h, H264SliceContext *sl, h264_weight_func *weight_op, h264_biweight_func *weight_avg) { - const int mb_xy = h->mb_xy; + const int mb_xy = sl->mb_xy; const int mb_type = h->cur_pic.mb_type[mb_xy]; assert(IS_INTER(mb_type)); -- cgit v1.2.3