diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-19 15:23:52 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-19 15:23:52 -0300 |
| commit | aec42ebc27c46625fb7fac9d5717056044ecac92 (patch) | |
| tree | 05ed6c848d1c536196a27cbfb2c5341addc9cb2a /libavcodec/cavsdec.c | |
| parent | 4e4dfcac58f3a582479319175ae3d17f337643c0 (diff) | |
| parent | f81be06cf614919d71ded29b8f595bef40123ad8 (diff) | |
| download | ffmpeg-aec42ebc27c46625fb7fac9d5717056044ecac92.tar.gz | |
Merge commit 'f81be06cf614919d71ded29b8f595bef40123ad8'
* commit 'f81be06cf614919d71ded29b8f595bef40123ad8':
cavs: Change type of stride parameters to ptrdiff_t
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/cavsdec.c')
| -rw-r--r-- | libavcodec/cavsdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 73a923df30..6f4d6aca69 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -545,7 +545,7 @@ static inline int dequant(AVSContext *h, int16_t *level_buf, uint8_t *run_buf, */ static int decode_residual_block(AVSContext *h, GetBitContext *gb, const struct dec_2dvlc *r, int esc_golomb_order, - int qp, uint8_t *dst, int stride) + int qp, uint8_t *dst, ptrdiff_t stride) { int i, esc_code, level, mask, ret; unsigned int level_code, run; |