Merge commit 'c28ed1d743443e783537d279ae721be3bbdf7646'

[ffmpeg] / libavcodec / h264_mb.c

diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c
index b1764a099fc6649b66f2713afc15f94f7f125a29..9036919a07b976d6b4d96068dd732217ca9993bf 100644 (file)
--- a/libavcodec/h264_mb.c
+++ b/libavcodec/h264_mb.c
@@ -493,12 +493,12 @@ static av_always_inline void prefetch_motion(const H264Context *h, H264SliceCont
         int off       =  mx * (1<< pixel_shift) +
                         (my + (sl->mb_x & 3) * 4) * sl->mb_linesize +
                         (64 << pixel_shift);
-        h->vdsp.prefetch(src[0] + off, h->linesize, 4);
+        h->vdsp.prefetch(src[0] + off, sl->linesize, 4);
         if (chroma_idc == 3 /* yuv444 */) {
-            h->vdsp.prefetch(src[1] + off, h->linesize, 4);
-            h->vdsp.prefetch(src[2] + off, h->linesize, 4);
+            h->vdsp.prefetch(src[1] + off, sl->linesize, 4);
+            h->vdsp.prefetch(src[2] + off, sl->linesize, 4);
         } else {
-            off= ((mx>>1)+64) * (1<<pixel_shift) + ((my>>1) + (sl->mb_x&7))*h->uvlinesize;
+            off= ((mx>>1)+64) * (1<<pixel_shift) + ((my>>1) + (sl->mb_x&7))*sl->uvlinesize;
             h->vdsp.prefetch(src[1] + off, src[2] - src[1], 2);
         }
     }