diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-21 15:13:36 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-21 15:13:36 +0100 |
| commit | 6eb75e7d592d103618f8b3fa1d9385abadbef156 (patch) | |
| tree | c3113e983e388e48fba3f066874360536f92cf0c /libavcodec/intrax8.c | |
| parent | 51b5672f49f54fbdeaf9828de1f806b1243a6e3d (diff) | |
| parent | 3281d823cdc7601c4900eb103958c05f59f65555 (diff) | |
| download | ffmpeg-6eb75e7d592d103618f8b3fa1d9385abadbef156.tar.gz | |
Merge commit '3281d823cdc7601c4900eb103958c05f59f65555'
* commit '3281d823cdc7601c4900eb103958c05f59f65555':
intrax8: Change type of array stride parameters to ptrdiff_t
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/intrax8.c')
| -rw-r--r-- | libavcodec/intrax8.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 5e1233bf0a..bbb97f04ff 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -544,7 +544,7 @@ static void x8_ac_compensation(IntraX8Context *const w, const int direction, } static void dsp_x8_put_solidcolor(const uint8_t pix, uint8_t *dst, - const int linesize) + const ptrdiff_t linesize) { int k; for (k = 0; k < 8; k++) { @@ -696,7 +696,7 @@ block_placed: if (w->loopfilter) { uint8_t *ptr = w->dest[chroma]; - int linesize = w->frame->linesize[!!chroma]; + ptrdiff_t linesize = w->frame->linesize[!!chroma]; if (!((w->edges & 2) || (zeros_only && (w->orient | 4) == 4))) w->dsp.h_loop_filter(ptr, linesize, w->quant); @@ -712,8 +712,8 @@ static void x8_init_block_index(IntraX8Context *w, AVFrame *frame) { // not parent codec linesize as this would be wrong for field pics // not that IntraX8 has interlacing support ;) - const int linesize = frame->linesize[0]; - const int uvlinesize = frame->linesize[1]; + const ptrdiff_t linesize = frame->linesize[0]; + const ptrdiff_t uvlinesize = frame->linesize[1]; w->dest[0] = frame->data[0]; w->dest[1] = frame->data[1]; |