diff options
author | James Almer <jamrial@gmail.com> | 2017-03-19 14:54:25 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-03-19 14:54:25 -0300 |
commit | 4004d33fcbbb93eaf57b5a5f8b2412b7807f094f (patch) | |
tree | f32596facfa46be27ebdd99c4efe77e9b18df91d /libavcodec/vp56.h | |
parent | 6a42a54b9de41d5eb1b246409e280c85194ed6ff (diff) | |
parent | d9d26a3674f31f482f54e936fcb382160830877a (diff) | |
download | ffmpeg-4004d33fcbbb93eaf57b5a5f8b2412b7807f094f.tar.gz |
Merge commit 'd9d26a3674f31f482f54e936fcb382160830877a'
* commit 'd9d26a3674f31f482f54e936fcb382160830877a':
vp56: Change type of stride parameters to ptrdiff_t
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/vp56.h')
-rw-r--r-- | libavcodec/vp56.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h index c049399df8..aacbe74a6b 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -72,7 +72,7 @@ typedef struct VP56mv { typedef void (*VP56ParseVectorAdjustment)(VP56Context *s, VP56mv *vect); typedef void (*VP56Filter)(VP56Context *s, uint8_t *dst, uint8_t *src, - int offset1, int offset2, int stride, + int offset1, int offset2, ptrdiff_t stride, VP56mv mv, int mask, int select, int luma); typedef int (*VP56ParseCoeff)(VP56Context *s); typedef void (*VP56DefaultModelsInit)(VP56Context *s); @@ -179,7 +179,7 @@ struct vp56_context { int flip; /* are we flipping ? */ int frbi; /* first row block index in MB */ int srbi; /* second row block index in MB */ - int stride[4]; /* stride for each plan */ + ptrdiff_t stride[4]; /* stride for each plan */ const uint8_t *vp56_coord_div; VP56ParseVectorAdjustment parse_vector_adjustment; |