diff options
author | James Almer <jamrial@gmail.com> | 2017-03-21 15:57:07 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-03-21 15:57:07 -0300 |
commit | a0478341f34be544e28b83ecfd768922de309416 (patch) | |
tree | b9fd46671cb8d9f8a1e752d33b56506d8eef6b62 /libavcodec/mss12.h | |
parent | b16752f694a5b580a8188fa2ef428a6afbb229d7 (diff) | |
parent | 15b4f494fc6bddb8178fdb5aed18b420efc75e22 (diff) | |
download | ffmpeg-a0478341f34be544e28b83ecfd768922de309416.tar.gz |
Merge commit '15b4f494fc6bddb8178fdb5aed18b420efc75e22'
* commit '15b4f494fc6bddb8178fdb5aed18b420efc75e22':
mss*: Change type of array stride parameters to ptrdiff_t
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/mss12.h')
-rw-r--r-- | libavcodec/mss12.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mss12.h b/libavcodec/mss12.h index f953167389..45c4074652 100644 --- a/libavcodec/mss12.h +++ b/libavcodec/mss12.h @@ -77,12 +77,12 @@ typedef struct MSS12Context { uint32_t pal[256]; uint8_t *pal_pic; uint8_t *last_pal_pic; - int pal_stride; + ptrdiff_t pal_stride; uint8_t *mask; - int mask_stride; + ptrdiff_t mask_stride; uint8_t *rgb_pic; uint8_t *last_rgb_pic; - int rgb_stride; + ptrdiff_t rgb_stride; int free_colours; int keyframe; int mvX, mvY; |