RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '21e500ba647aec233d5930d3d1081489d0d53ceb' 

* commit '21e500ba647aec233d5930d3d1081489d0d53ceb':
  svq1dec: Change type of array pitch parameters to ptrdiff_t

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-20 09:17:34 +01:00
parent bb3ad401fc 21e500ba64
commit e59d8d030f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/svq1dec.c
View File

@ -154,7 +154,7 @@ static const uint8_t string_table[256] = {
n4 = (mean << 16) + mean; n4 = (mean << 16) + mean;
static int svq1_decode_block_intra(GetBitContext *bitbuf, uint8_t *pixels, static int svq1_decode_block_intra(GetBitContext *bitbuf, uint8_t *pixels,
int pitch) ptrdiff_t pitch)
{ {
uint32_t bit_cache; uint32_t bit_cache;
uint8_t *list[63]; 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, static int svq1_decode_block_non_intra(GetBitContext *bitbuf, uint8_t *pixels,
int pitch) ptrdiff_t pitch)
{ {
uint32_t bit_cache; uint32_t bit_cache;
uint8_t *list[63]; 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, 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 *src;
uint8_t *dst; 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, static int svq1_motion_inter_block(HpelDSPContext *hdsp, GetBitContext *bitbuf,
uint8_t *current, uint8_t *previous, 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) int width, int height)
{ {
uint8_t *src; 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, static int svq1_motion_inter_4v_block(HpelDSPContext *hdsp, GetBitContext *bitbuf,
uint8_t *current, uint8_t *previous, 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) int width, int height)
{ {
uint8_t *src; 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, static int svq1_decode_delta_block(AVCodecContext *avctx, HpelDSPContext *hdsp,
GetBitContext *bitbuf, GetBitContext *bitbuf,
uint8_t *current, uint8_t *previous, 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) int width, int height)
{ {
uint32_t block_type; uint32_t block_type;