Merge commit 'de452e503734ebb0fdbce86e9d16693b3530fad3'

[ffmpeg] / libavcodec / alpha / pixblockdsp_alpha.c

diff --git a/libavcodec/alpha/pixblockdsp_alpha.c b/libavcodec/alpha/pixblockdsp_alpha.c
index 866b762b162754c7b0358e70228db2b25e50b344..c2f1a1d79c539f19dfe28e5e7bdf8bc87c243a9f 100644 (file)
--- a/libavcodec/alpha/pixblockdsp_alpha.c
+++ b/libavcodec/alpha/pixblockdsp_alpha.c
@@ -23,7 +23,7 @@
 #include "asm.h"
 
 static void get_pixels_mvi(int16_t *restrict block,
-                           const uint8_t *restrict pixels, ptrdiff_t line_size)
+                           const uint8_t *restrict pixels, ptrdiff_t stride)
 {
     int h = 8;
 
@@ -34,13 +34,14 @@ static void get_pixels_mvi(int16_t *restrict block,
         stq(unpkbw(p),       block);
         stq(unpkbw(p >> 32), block + 4);
 
-        pixels += line_size;
+        pixels += stride;
         block += 8;
     } while (--h);
 }
 
 static void diff_pixels_mvi(int16_t *block, const uint8_t *s1, const uint8_t *s2,
-                            int stride) {
+                            ptrdiff_t stride)
+{
     int h = 8;
     uint64_t mask = 0x4040;