diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-20 11:31:27 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-20 11:33:48 +0100 |
| commit | eed8ccde3e56a020255f8df3855702d029f30f21 (patch) | |
| tree | b00255357decdda853bef98e4f8bec97acda15d3 /libavcodec/utvideoenc.c | |
| parent | 8316a0e08b899dcdb634bf184531e9e22d889068 (diff) | |
| parent | 131a85a1fed9966bbd38517f76abfac0237e39dc (diff) | |
Merge commit '131a85a1fed9966bbd38517f76abfac0237e39dc'
* commit '131a85a1fed9966bbd38517f76abfac0237e39dc':
utvideo: Change type of array stride parameters to ptrdiff_t
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/utvideoenc.c')
| -rw-r--r-- | libavcodec/utvideoenc.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 2b1230f9aa..840742caf7 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -242,8 +242,9 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; } -static void mangle_rgb_planes(uint8_t *dst[4], int dst_stride, uint8_t *src, - int step, int stride, int width, int height) +static void mangle_rgb_planes(uint8_t *dst[4], ptrdiff_t dst_stride, + uint8_t *src, int step, ptrdiff_t stride, + int width, int height) { int i, j; int k = 2 * dst_stride; @@ -276,7 +277,7 @@ static void mangle_rgb_planes(uint8_t *dst[4], int dst_stride, uint8_t *src, } /* Write data to a plane with left prediction */ -static void left_predict(uint8_t *src, uint8_t *dst, int stride, +static void left_predict(uint8_t *src, uint8_t *dst, ptrdiff_t stride, int width, int height) { int i, j; @@ -296,8 +297,8 @@ static void left_predict(uint8_t *src, uint8_t *dst, int stride, #undef B /* Write data to a plane with median prediction */ -static void median_predict(UtvideoContext *c, uint8_t *src, uint8_t *dst, int stride, - int width, int height) +static void median_predict(UtvideoContext *c, uint8_t *src, uint8_t *dst, + ptrdiff_t stride, int width, int height) { int i, j; int A, B; @@ -398,7 +399,7 @@ static int write_huff_codes(uint8_t *src, uint8_t *dst, int dst_size, } static int encode_plane(AVCodecContext *avctx, uint8_t *src, - uint8_t *dst, int stride, int plane_no, + uint8_t *dst, ptrdiff_t stride, int plane_no, int width, int height, PutByteContext *pb) { UtvideoContext *c = avctx->priv_data; |