summaryrefslogtreecommitdiffstats
path: root/libavcodec/eatgq.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-03-21 15:55:44 -0300
committerJames Almer <jamrial@gmail.com>2017-03-21 15:55:44 -0300
commitb16752f694a5b580a8188fa2ef428a6afbb229d7 (patch)
treecc53a36f70cccd50d4e6f09bd597d537089d6a09 /libavcodec/eatgq.c
parent1e185488269fd5639bc4fe826c8cd53c3e45c047 (diff)
parenta339e919cad1ab0125948f0dd9d49f6cb590db89 (diff)
downloadffmpeg-streaming-b16752f694a5b580a8188fa2ef428a6afbb229d7.zip
ffmpeg-streaming-b16752f694a5b580a8188fa2ef428a6afbb229d7.tar.gz
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/eatgq.c')
-rw-r--r--libavcodec/eatgq.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c
index a43d688..1308c07 100644
--- a/libavcodec/eatgq.c
+++ b/libavcodec/eatgq.c
@@ -107,7 +107,7 @@ static void tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb
static void tgq_idct_put_mb(TgqContext *s, int16_t (*block)[64], AVFrame *frame,
int mb_x, int mb_y)
{
- int linesize = frame->linesize[0];
+ ptrdiff_t linesize = frame->linesize[0];
uint8_t *dest_y = frame->data[0] + (mb_y * 16 * linesize) + mb_x * 16;
uint8_t *dest_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8;
uint8_t *dest_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8;
@@ -123,7 +123,7 @@ static void tgq_idct_put_mb(TgqContext *s, int16_t (*block)[64], AVFrame *frame,
}
static inline void tgq_dconly(TgqContext *s, unsigned char *dst,
- int dst_stride, int dc)
+ ptrdiff_t dst_stride, int dc)
{
int level = av_clip_uint8((dc*s->qtable[0] + 2056) >> 4);
int j;
@@ -134,7 +134,7 @@ static inline void tgq_dconly(TgqContext *s, unsigned char *dst,
static void tgq_idct_put_mb_dconly(TgqContext *s, AVFrame *frame,
int mb_x, int mb_y, const int8_t *dc)
{
- int linesize = frame->linesize[0];
+ ptrdiff_t linesize = frame->linesize[0];
uint8_t *dest_y = frame->data[0] + (mb_y * 16 * linesize) + mb_x * 16;
uint8_t *dest_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8;
uint8_t *dest_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8;
OpenPOWER on IntegriCloud