diff options
author | James Almer <jamrial@gmail.com> | 2017-03-21 15:49:09 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-03-21 15:49:09 -0300 |
commit | 1e185488269fd5639bc4fe826c8cd53c3e45c047 (patch) | |
tree | ec799bf3c66f06a8091067ba83a68b12224d72d0 /libavcodec/hevc_filter.c | |
parent | a8474df9447d6466c77d3ec8f414cda2662f057b (diff) | |
parent | ba479f3daafc7e4359ec1212164569ebe59f0bb7 (diff) |
Merge commit 'ba479f3daafc7e4359ec1212164569ebe59f0bb7'
* commit 'ba479f3daafc7e4359ec1212164569ebe59f0bb7':
hevc: Change type of array stride parameters to ptrdiff_t
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/hevc_filter.c')
-rw-r--r-- | libavcodec/hevc_filter.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index 6918a553f2..fe520f45b2 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -139,7 +139,7 @@ static int get_qPy(HEVCContext *s, int xC, int yC) } static void copy_CTB(uint8_t *dst, const uint8_t *src, int width, int height, - intptr_t stride_dst, intptr_t stride_src) + ptrdiff_t stride_dst, ptrdiff_t stride_src) { int i, j; @@ -170,7 +170,7 @@ static void copy_pixel(uint8_t *dst, const uint8_t *src, int pixel_shift) static void copy_vert(uint8_t *dst, const uint8_t *src, int pixel_shift, int height, - int stride_dst, int stride_src) + ptrdiff_t stride_dst, ptrdiff_t stride_src) { int i; if (pixel_shift == 0) { @@ -189,7 +189,7 @@ static void copy_vert(uint8_t *dst, const uint8_t *src, } static void copy_CTB_to_hv(HEVCContext *s, const uint8_t *src, - int stride_src, int x, int y, int width, int height, + ptrdiff_t stride_src, int x, int y, int width, int height, int c_idx, int x_ctb, int y_ctb) { int sh = s->ps.sps->pixel_shift; @@ -306,14 +306,14 @@ static void sao_filter_CTB(HEVCContext *s, int x, int y) for (c_idx = 0; c_idx < (s->ps.sps->chroma_format_idc ? 3 : 1); c_idx++) { int x0 = x >> s->ps.sps->hshift[c_idx]; int y0 = y >> s->ps.sps->vshift[c_idx]; - int stride_src = s->frame->linesize[c_idx]; + ptrdiff_t stride_src = s->frame->linesize[c_idx]; int ctb_size_h = (1 << (s->ps.sps->log2_ctb_size)) >> s->ps.sps->hshift[c_idx]; int ctb_size_v = (1 << (s->ps.sps->log2_ctb_size)) >> s->ps.sps->vshift[c_idx]; int width = FFMIN(ctb_size_h, (s->ps.sps->width >> s->ps.sps->hshift[c_idx]) - x0); int height = FFMIN(ctb_size_v, (s->ps.sps->height >> s->ps.sps->vshift[c_idx]) - y0); int tab = sao_tab[(FFALIGN(width, 8) >> 3) - 1]; uint8_t *src = &s->frame->data[c_idx][y0 * stride_src + (x0 << s->ps.sps->pixel_shift)]; - int stride_dst; + ptrdiff_t stride_dst; uint8_t *dst; switch (sao->type_idx[c_idx]) { |