diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-20 09:07:57 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-20 09:07:57 +0100 |
| commit | bb3ad401fc658708acffc9fd1b12be6652516c00 (patch) | |
| tree | 4d7a66f58cc75b05871588d57cd1759fb8d380ac /libavcodec/ivi.h | |
| parent | 3835283293bfd38ba69203f4618f0f0f21377bcc (diff) | |
| parent | 746c56b7730ce09397d3a8354acc131285e9d829 (diff) | |
| download | ffmpeg-bb3ad401fc658708acffc9fd1b12be6652516c00.tar.gz | |
Merge commit '746c56b7730ce09397d3a8354acc131285e9d829'
* commit '746c56b7730ce09397d3a8354acc131285e9d829':
indeo: Change type of array pitch parameters to ptrdiff_t
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/ivi.h')
| -rw-r--r-- | libavcodec/ivi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ivi.h b/libavcodec/ivi.h index 3571808247..79b97d5c52 100644 --- a/libavcodec/ivi.h +++ b/libavcodec/ivi.h @@ -87,8 +87,8 @@ extern const uint8_t ff_ivi_direct_scan_4x4[16]; /** * Declare inverse transform function types */ -typedef void (InvTransformPtr)(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags); -typedef void (DCTransformPtr) (const int32_t *in, int16_t *out, uint32_t pitch, int blk_size); +typedef void (InvTransformPtr)(const int32_t *in, int16_t *out, ptrdiff_t pitch, const uint8_t *flags); +typedef void (DCTransformPtr) (const int32_t *in, int16_t *out, ptrdiff_t pitch, int blk_size); /** @@ -153,7 +153,7 @@ typedef struct IVIBandDesc { int16_t *ref_buf; ///< pointer to the reference frame buffer (for motion compensation) int16_t *b_ref_buf; ///< pointer to the second reference frame buffer (for motion compensation) int16_t *bufs[4]; ///< array of pointers to the band buffers - int pitch; ///< pitch associated with the buffers above + ptrdiff_t pitch; ///< pitch associated with the buffers above int is_empty; ///< = 1 if this band doesn't contain any data int mb_size; ///< macroblock size int blk_size; ///< block size |