Merge commit 'e070d0a5ca9047192e324a3f87006b316e2a08a7'

[ffmpeg] / libavcodec / pixblockdsp_template.c

diff --git a/libavcodec/pixblockdsp_template.c b/libavcodec/pixblockdsp_template.c
index 3aeddf526c7968b9ab346466845b03a06dccd460..d1e91022a7054ae2d4aee33210dcb91ff4b02cbb 100644 (file)
--- a/libavcodec/pixblockdsp_template.c
+++ b/libavcodec/pixblockdsp_template.c
@@ -19,7 +19,7 @@
 #include "bit_depth_template.c"
 
 static void FUNCC(get_pixels)(int16_t *av_restrict block, const uint8_t *_pixels,
-                              int line_size)
+                              ptrdiff_t line_size)
 {
     const pixel *pixels = (const pixel *) _pixels;
     int i;