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/mss3.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/mss3.c')
| -rw-r--r-- | libavcodec/mss3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mss3.c b/libavcodec/mss3.c index 01941967a5..7f3801774a 100644 --- a/libavcodec/mss3.c +++ b/libavcodec/mss3.c @@ -91,7 +91,7 @@ typedef struct ImageBlockCoder { typedef struct DCTBlockCoder { int *prev_dc; - int prev_dc_stride; + ptrdiff_t prev_dc_stride; int prev_dc_height; int quality; uint16_t qmat[64]; @@ -450,7 +450,7 @@ static int decode_coeff(RangeCoder *c, Model *m) } static void decode_fill_block(RangeCoder *c, FillBlockCoder *fc, - uint8_t *dst, int stride, int block_size) + uint8_t *dst, ptrdiff_t stride, int block_size) { int i; @@ -461,7 +461,7 @@ static void decode_fill_block(RangeCoder *c, FillBlockCoder *fc, } static void decode_image_block(RangeCoder *c, ImageBlockCoder *ic, - uint8_t *dst, int stride, int block_size) + uint8_t *dst, ptrdiff_t stride, int block_size) { int i, j; int vec_size; @@ -557,7 +557,7 @@ static int decode_dct(RangeCoder *c, DCTBlockCoder *bc, int *block, } static void decode_dct_block(RangeCoder *c, DCTBlockCoder *bc, - uint8_t *dst, int stride, int block_size, + uint8_t *dst, ptrdiff_t stride, int block_size, int *block, int mb_x, int mb_y) { int i, j; @@ -580,8 +580,8 @@ static void decode_dct_block(RangeCoder *c, DCTBlockCoder *bc, } static void decode_haar_block(RangeCoder *c, HaarBlockCoder *hc, - uint8_t *dst, int stride, int block_size, - int *block) + uint8_t *dst, ptrdiff_t stride, + int block_size, int *block) { const int hsize = block_size >> 1; int A, B, C, D, t1, t2, t3, t4; |