[FFmpeg-cvslog] Merge commit 'a339e919cad1ab0125948f0dd9d49f6cb590db89'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Mar 21 15:55:44 2017 -0300| [b16752f694a5b580a8188fa2ef428a6afbb229d7] | committer: James Almer

Merge commit 'a339e919cad1ab0125948f0dd9d49f6cb590db89'

* commit 'a339e919cad1ab0125948f0dd9d49f6cb590db89':
  ea: Change type of array stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b16752f694a5b580a8188fa2ef428a6afbb229d7
---

 libavcodec/eacmv.c  | 4 ++--
 libavcodec/eaidct.c | 3 ++-
 libavcodec/eaidct.h | 3 ++-
 libavcodec/eamad.c  | 4 ++--
 libavcodec/eatgq.c  | 6 +++---
 libavcodec/eatgv.c  | 2 +-
 libavcodec/eatqi.c  | 2 +-
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index 047be81..bf4404c 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){
diff --git a/libavcodec/eaidct.c b/libavcodec/eaidct.c
index e4840f2..038ee2a 100644
--- a/libavcodec/eaidct.c
+++ b/libavcodec/eaidct.c
@@ -77,7 +77,8 @@ static inline void ea_idct_col(int16_t *dest, const int16_t *src) {
         IDCT_COL(dest, src);
 }
 
-void ff_ea_idct_put_c(uint8_t *dest, int linesize, int16_t *block) {
+void ff_ea_idct_put_c(uint8_t *dest, ptrdiff_t linesize, int16_t *block)
+{
     int i;
     int16_t temp[64];
     block[0] += 4;
diff --git a/libavcodec/eaidct.h b/libavcodec/eaidct.h
index 6b9ec1c..a46dae9 100644
--- a/libavcodec/eaidct.h
+++ b/libavcodec/eaidct.h
@@ -19,8 +19,9 @@
 #ifndef AVCODEC_EAIDCT_H
 #define AVCODEC_EAIDCT_H
 
+#include <stddef.h>
 #include <stdint.h>
 
-void ff_ea_idct_put_c(uint8_t *dest, int linesize, int16_t *block);
+void ff_ea_idct_put_c(uint8_t *dest, ptrdiff_t linesize, int16_t *block);
 
 #endif /* AVCODEC_EAIDCT_H */
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c
index bb0f005..23b1a3c 100644
--- a/libavcodec/eamad.c
+++ b/libavcodec/eamad.c
@@ -80,8 +80,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
     return 0;
 }
 
-static inline void comp(unsigned char *dst, int dst_stride,
-                        unsigned char *src, int src_stride, int add)
+static inline void comp(unsigned char *dst, ptrdiff_t dst_stride,
+                        unsigned char *src, ptrdiff_t src_stride, int add)
 {
     int j, i;
     for (j=0; j<8; j++)
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;
diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c
index 60399c5..93e291f 100644
--- a/libavcodec/eatgv.c
+++ b/libavcodec/eatgv.c
@@ -227,7 +227,7 @@ static int tgv_decode_inter(TgvContext *s, AVFrame *frame,
         for (x = 0; x < s->avctx->width / 4; x++) {
             unsigned int vector = get_bits(&gb, vector_bits);
             const uint8_t *src;
-            int src_stride;
+            ptrdiff_t src_stride;
 
             if (vector < num_mvs) {
                 int mx = x * 4 + s->mv_codebook[vector][0];
diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c
index 8fd5cdb..f5ecacb 100644
--- a/libavcodec/eatqi.c
+++ b/libavcodec/eatqi.c
@@ -94,7 +94,7 @@ static inline void tqi_idct_put(AVCodecContext *avctx, AVFrame *frame,
                                 int16_t (*block)[64])
 {
     TqiContext *t = avctx->priv_data;
-    int linesize = frame->linesize[0];
+    ptrdiff_t linesize = frame->linesize[0];
     uint8_t *dest_y  = frame->data[0] + t->mb_y * 16 * linesize           + t->mb_x * 16;
     uint8_t *dest_cb = frame->data[1] + t->mb_y *  8 * frame->linesize[1] + t->mb_x *  8;
     uint8_t *dest_cr = frame->data[2] + t->mb_y *  8 * frame->linesize[2] + t->mb_x *  8;


======================================================================