diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-21 15:55:44 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-21 15:55:44 -0300 |
| commit | b16752f694a5b580a8188fa2ef428a6afbb229d7 (patch) | |
| tree | cc53a36f70cccd50d4e6f09bd597d537089d6a09 /libavcodec/eacmv.c | |
| parent | 1e185488269fd5639bc4fe826c8cd53c3e45c047 (diff) | |
| parent | a339e919cad1ab0125948f0dd9d49f6cb590db89 (diff) | |
Merge commit 'a339e919cad1ab0125948f0dd9d49f6cb590db89'
* commit 'a339e919cad1ab0125948f0dd9d49f6cb590db89':
ea: Change type of array stride parameters to ptrdiff_t
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/eacmv.c')
| -rw-r--r-- | libavcodec/eacmv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c index 047be813b1..bf4404ce42 100644 --- a/libavcodec/eacmv.c +++ b/libavcodec/eacmv.c @@ -72,8 +72,8 @@ static void cmv_decode_intra(CmvContext * s, AVFrame *frame, } } -static void cmv_motcomp(unsigned char *dst, int dst_stride, - const unsigned char *src, int src_stride, +static void cmv_motcomp(unsigned char *dst, ptrdiff_t dst_stride, + const unsigned char *src, ptrdiff_t src_stride, int x, int y, int xoffset, int yoffset, int width, int height){ |