Merge commit '9b2ccafb480c94fd09cfb24306d5296dc013cf5b'

[ffmpeg] / libavcodec / blockdsp.h

diff --git a/libavcodec/blockdsp.h b/libavcodec/blockdsp.h
index 95e1d0f32e114852c3db30d32de5d0d963dc35d3..6e27a02ba52d87367b98a9cbb5515a52caa69b59 100644 (file)
--- a/libavcodec/blockdsp.h
+++ b/libavcodec/blockdsp.h
@@ -19,6 +19,7 @@
 #ifndef AVCODEC_BLOCKDSP_H
 #define AVCODEC_BLOCKDSP_H
 
+#include <stddef.h>
 #include <stdint.h>
 
 #include "avcodec.h"
@@ -29,7 +30,7 @@
  * h for op_pixels_func is limited to { width / 2, width },
  * but never larger than 16 and never smaller than 4. */
 typedef void (*op_fill_func)(uint8_t *block /* align width (8 or 16) */,
-                             uint8_t value, int line_size, int h);
+                             uint8_t value, ptrdiff_t line_size, int h);
 
 typedef struct BlockDSPContext {
     void (*clear_block)(int16_t *block /* align 16 */);