summaryrefslogtreecommitdiff
path: root/libavcodec/utvideodec.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-09-01 21:31:22 +0200
committerDiego Biurrun <diego@biurrun.de>2016-09-08 13:51:30 +0200
commit131a85a1fed9966bbd38517f76abfac0237e39dc (patch)
tree26f3dd244813b6a621e3d4a60427522b74fc04b6 /libavcodec/utvideodec.c
parent52730e0f867fe77b7d2353d8b44e92edb7079ca5 (diff)
utvideo: Change type of array stride parameters to ptrdiff_t
ptrdiff_t is the correct type for array strides and similar.
Diffstat (limited to 'libavcodec/utvideodec.c')
-rw-r--r--libavcodec/utvideodec.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c
index 30ca4d2164..3a581568dd 100644
--- a/libavcodec/utvideodec.c
+++ b/libavcodec/utvideodec.c
@@ -78,7 +78,7 @@ static int build_huff(const uint8_t *src, VLC *vlc, int *fsym)
}
static int decode_plane(UtvideoContext *c, int plane_no,
- uint8_t *dst, int step, int stride,
+ uint8_t *dst, int step, ptrdiff_t stride,
int width, int height,
const uint8_t *src, int use_pred)
{
@@ -182,8 +182,8 @@ fail:
return AVERROR_INVALIDDATA;
}
-static void restore_rgb_planes(uint8_t *src, int step, int stride, int width,
- int height)
+static void restore_rgb_planes(uint8_t *src, int step, ptrdiff_t stride,
+ int width, int height)
{
int i, j;
uint8_t r, g, b;
@@ -200,7 +200,7 @@ static void restore_rgb_planes(uint8_t *src, int step, int stride, int width,
}
}
-static void restore_median(uint8_t *src, int step, int stride,
+static void restore_median(uint8_t *src, int step, ptrdiff_t stride,
int width, int height, int slices, int rmode)
{
int i, j, slice;
@@ -256,7 +256,7 @@ static void restore_median(uint8_t *src, int step, int stride,
* so restoring function should take care of possible padding between
* two parts of the same "line".
*/
-static void restore_median_il(uint8_t *src, int step, int stride,
+static void restore_median_il(uint8_t *src, int step, ptrdiff_t stride,
int width, int height, int slices, int rmode)
{
int i, j, slice;
@@ -264,7 +264,7 @@ static void restore_median_il(uint8_t *src, int step, int stride,
uint8_t *bsrc;
int slice_start, slice_height;
const int cmask = ~(rmode ? 3 : 1);
- const int stride2 = stride << 1;
+ const ptrdiff_t stride2 = stride << 1;
for (slice = 0; slice < slices; slice++) {
slice_start = ((slice * height) / slices) & cmask;