diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-20 09:17:34 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-20 09:17:34 +0100 |
| commit | e59d8d030fd4d7882644eb49d07f04a1dbb387ef (patch) | |
| tree | 7f776e8938c4c951149014824c80d913dee60c8d /libavcodec/svq1dec.c | |
| parent | bb3ad401fc658708acffc9fd1b12be6652516c00 (diff) | |
| parent | 21e500ba647aec233d5930d3d1081489d0d53ceb (diff) | |
Merge commit '21e500ba647aec233d5930d3d1081489d0d53ceb'
* commit '21e500ba647aec233d5930d3d1081489d0d53ceb':
svq1dec: Change type of array pitch parameters to ptrdiff_t
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/svq1dec.c')
| -rw-r--r-- | libavcodec/svq1dec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 2b72e08d3a..d3e60c3a4a 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -154,7 +154,7 @@ static const uint8_t string_table[256] = { n4 = (mean << 16) + mean; static int svq1_decode_block_intra(GetBitContext *bitbuf, uint8_t *pixels, - int pitch) + ptrdiff_t pitch) { uint32_t bit_cache; uint8_t *list[63]; @@ -221,7 +221,7 @@ static int svq1_decode_block_intra(GetBitContext *bitbuf, uint8_t *pixels, } static int svq1_decode_block_non_intra(GetBitContext *bitbuf, uint8_t *pixels, - int pitch) + ptrdiff_t pitch) { uint32_t bit_cache; uint8_t *list[63]; @@ -307,7 +307,7 @@ static int svq1_decode_motion_vector(GetBitContext *bitbuf, svq1_pmv *mv, } static void svq1_skip_block(uint8_t *current, uint8_t *previous, - int pitch, int x, int y) + ptrdiff_t pitch, int x, int y) { uint8_t *src; uint8_t *dst; @@ -325,7 +325,7 @@ static void svq1_skip_block(uint8_t *current, uint8_t *previous, static int svq1_motion_inter_block(HpelDSPContext *hdsp, GetBitContext *bitbuf, uint8_t *current, uint8_t *previous, - int pitch, svq1_pmv *motion, int x, int y, + ptrdiff_t pitch, svq1_pmv *motion, int x, int y, int width, int height) { uint8_t *src; @@ -368,7 +368,7 @@ static int svq1_motion_inter_block(HpelDSPContext *hdsp, GetBitContext *bitbuf, static int svq1_motion_inter_4v_block(HpelDSPContext *hdsp, GetBitContext *bitbuf, uint8_t *current, uint8_t *previous, - int pitch, svq1_pmv *motion, int x, int y, + ptrdiff_t pitch, svq1_pmv *motion, int x, int y, int width, int height) { uint8_t *src; @@ -446,7 +446,7 @@ static int svq1_motion_inter_4v_block(HpelDSPContext *hdsp, GetBitContext *bitbu static int svq1_decode_delta_block(AVCodecContext *avctx, HpelDSPContext *hdsp, GetBitContext *bitbuf, uint8_t *current, uint8_t *previous, - int pitch, svq1_pmv *motion, int x, int y, + ptrdiff_t pitch, svq1_pmv *motion, int x, int y, int width, int height) { uint32_t block_type; |