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/mss2.c | |
parent | b16752f694a5b580a8188fa2ef428a6afbb229d7 (diff) | |
parent | 15b4f494fc6bddb8178fdb5aed18b420efc75e22 (diff) |
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/mss2.c')
-rw-r--r-- | libavcodec/mss2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 581865b0b1..9e7cc466de 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -174,7 +174,7 @@ static int decode_pal_v2(MSS12Context *ctx, const uint8_t *buf, int buf_size) return 1 + ncol * 3; } -static int decode_555(GetByteContext *gB, uint16_t *dst, int stride, +static int decode_555(GetByteContext *gB, uint16_t *dst, ptrdiff_t stride, int keyframe, int w, int h) { int last_symbol = 0, repeat = 0, prev_avail = 0; @@ -237,8 +237,8 @@ static int decode_555(GetByteContext *gB, uint16_t *dst, int stride, return 0; } -static int decode_rle(GetBitContext *gb, uint8_t *pal_dst, int pal_stride, - uint8_t *rgb_dst, int rgb_stride, uint32_t *pal, +static int decode_rle(GetBitContext *gb, uint8_t *pal_dst, ptrdiff_t pal_stride, + uint8_t *rgb_dst, ptrdiff_t rgb_stride, uint32_t *pal, int keyframe, int kf_slipt, int slice, int w, int h) { uint8_t bits[270] = { 0 }; |