Merge commit 'e070d0a5ca9047192e324a3f87006b316e2a08a7'

[ffmpeg] / libavcodec / dv.h

diff --git a/libavcodec/dv.h b/libavcodec/dv.h
index 14cfbce1949dd9601e96c801cb9df004348d6d14..aa761dc751fb2a6d4e9f261e0c3e17c9c2f42ac1 100644 (file)
--- a/libavcodec/dv.h
+++ b/libavcodec/dv.h
@@ -45,7 +45,7 @@ typedef struct DVVideoContext {
 
     uint8_t  dv_zigzag[2][64];
 
-    void (*get_pixels)(int16_t *block, const uint8_t *pixels, int line_size);
+    void (*get_pixels)(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size);
     void (*fdct[2])(int16_t *block);
     void (*idct_put[2])(uint8_t *dest, int line_size, int16_t *block);
     me_cmp_func ildct_cmp;