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/mss2dsp.c | |
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/mss2dsp.c')
-rw-r--r-- | libavcodec/mss2dsp.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/mss2dsp.c b/libavcodec/mss2dsp.c index c5fc1f8dcf..cc39dd637f 100644 --- a/libavcodec/mss2dsp.c +++ b/libavcodec/mss2dsp.c @@ -27,17 +27,17 @@ #include "libavutil/common.h" static av_always_inline void mss2_blit_wmv9_template(uint8_t *dst, - int dst_stride, + ptrdiff_t dst_stride, int gray, int use_mask, int maskcolor, const uint8_t *mask, - int mask_stride, + ptrdiff_t mask_stride, const uint8_t *srcy, - int srcy_stride, + ptrdiff_t srcy_stride, const uint8_t *srcu, const uint8_t *srcv, - int srcuv_stride, + ptrdiff_t srcuv_stride, int w, int h) { int i, j, k, r = -1; @@ -64,10 +64,10 @@ static av_always_inline void mss2_blit_wmv9_template(uint8_t *dst, } } -static void mss2_blit_wmv9_c(uint8_t *dst, int dst_stride, - const uint8_t *srcy, int srcy_stride, +static void mss2_blit_wmv9_c(uint8_t *dst, ptrdiff_t dst_stride, + const uint8_t *srcy, ptrdiff_t srcy_stride, const uint8_t *srcu, const uint8_t *srcv, - int srcuv_stride, int w, int h) + ptrdiff_t srcuv_stride, int w, int h) { mss2_blit_wmv9_template(dst, dst_stride, 0, 0, 0, NULL, 0, @@ -76,12 +76,12 @@ static void mss2_blit_wmv9_c(uint8_t *dst, int dst_stride, w, h); } -static void mss2_blit_wmv9_masked_c(uint8_t *dst, int dst_stride, +static void mss2_blit_wmv9_masked_c(uint8_t *dst, ptrdiff_t dst_stride, int maskcolor, const uint8_t *mask, - int mask_stride, - const uint8_t *srcy, int srcy_stride, + ptrdiff_t mask_stride, + const uint8_t *srcy, ptrdiff_t srcy_stride, const uint8_t *srcu, const uint8_t *srcv, - int srcuv_stride, int w, int h) + ptrdiff_t srcuv_stride, int w, int h) { mss2_blit_wmv9_template(dst, dst_stride, 0, 1, maskcolor, mask, mask_stride, @@ -90,9 +90,9 @@ static void mss2_blit_wmv9_masked_c(uint8_t *dst, int dst_stride, w, h); } -static void mss2_gray_fill_masked_c(uint8_t *dst, int dst_stride, +static void mss2_gray_fill_masked_c(uint8_t *dst, ptrdiff_t dst_stride, int maskcolor, const uint8_t *mask, - int mask_stride, int w, int h) + ptrdiff_t mask_stride, int w, int h) { mss2_blit_wmv9_template(dst, dst_stride, 1, 1, maskcolor, mask, mask_stride, @@ -101,7 +101,7 @@ static void mss2_gray_fill_masked_c(uint8_t *dst, int dst_stride, w, h); } -static void upsample_plane_c(uint8_t *plane, int plane_stride, int w, int h) +static void upsample_plane_c(uint8_t *plane, ptrdiff_t plane_stride, int w, int h) { uint8_t *src1, *src2, *dst1, *dst2, *p, a, b; int i, j; |