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.h | |
| 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.h')
| -rw-r--r-- | libavcodec/mss2dsp.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/libavcodec/mss2dsp.h b/libavcodec/mss2dsp.h index 7368abb581..e44c9ab527 100644 --- a/libavcodec/mss2dsp.h +++ b/libavcodec/mss2dsp.h @@ -26,23 +26,25 @@ #ifndef AVCODEC_MSS2DSP_H #define AVCODEC_MSS2DSP_H +#include <stddef.h> #include <stdint.h> typedef struct MSS2DSPContext { - void (*mss2_blit_wmv9)(uint8_t *dst, int dst_stride, - const uint8_t *srcy, int srcy_stride, + void (*mss2_blit_wmv9)(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); - void (*mss2_blit_wmv9_masked)(uint8_t *dst, int dst_stride, + ptrdiff_t srcuv_stride, int w, int h); + void (*mss2_blit_wmv9_masked)(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); - void (*mss2_gray_fill_masked)(uint8_t *dst, int dst_stride, + ptrdiff_t srcuv_stride, int w, int h); + void (*mss2_gray_fill_masked)(uint8_t *dst, ptrdiff_t dst_stride, int maskcolor, const uint8_t *mask, - int mask_stride, int w, int h); - void (*upsample_plane)(uint8_t *plane, int plane_stride, int w, int h); + ptrdiff_t mask_stride, int w, int h); + void (*upsample_plane)(uint8_t *plane, ptrdiff_t plane_stride, + int w, int h); } MSS2DSPContext; void ff_mss2dsp_init(MSS2DSPContext *dsp); |