Merge commit 'f81be06cf614919d71ded29b8f595bef40123ad8'

* commit 'f81be06cf614919d71ded29b8f595bef40123ad8':
  cavs: Change type of stride parameters to ptrdiff_t

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

diff --cc libavcodec/cavs.c
Simple merge

diff --cc libavcodec/cavs.h
Simple merge

diff --cc libavcodec/cavsdec.c
index 73a923df309847cdc33e5c23e7c9aafe8e7c8e20,1c4f276373f2c003e48579060e242ad804f7dab3..6f4d6aca69f130d8dac447ef634add2cc600632f
--- 1/libavcodec/cavsdec.c
--- 2/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@@ -545,10 -547,9 +545,10 @@@ static inline int dequant(AVSContext *h
   */
  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, level_code, esc_code, level, run, mask, ret;
 +    int i, esc_code, level, mask, ret;
 +    unsigned int level_code, run;
      int16_t level_buf[65];
      uint8_t run_buf[65];
      int16_t *block = h->block;

diff --cc libavcodec/cavsdsp.c
index df9490ad8f770ae7c962af61b3611d19ae2f8768,a374dec30b92be6c2ceb4e2059e70b7ef12e7eec..90a67e910ceeaf54c6cf367550abac1589ed1a1a
--- 1/libavcodec/cavsdsp.c
--- 2/libavcodec/cavsdsp.c
+++ b/libavcodec/cavsdsp.c
@@@ -185,9 -193,11 +193,10 @@@ static void cavs_filter_ch_c(uint8_t *d
   *
   ****************************************************************************/
  
- static void cavs_idct8_add_c(uint8_t *dst, int16_t *block, int stride) {
+ static void cavs_idct8_add_c(uint8_t *dst, int16_t *block, ptrdiff_t stride)
+ {
      int i;
      int16_t (*src)[8] = (int16_t(*)[8])block;
 -    const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
  
      src[0][0] += 8;
  

diff --cc libavcodec/cavsdsp.h
Simple merge

diff --cc libavcodec/x86/cavsdsp.c
index e57d8be76af8d38609a508a4ef6796cffcde293e,b5406ef16d259596db00e9832b57f40b19c13471..ecb9b231f1ec04749c4e1ee76894116ceb12e240
--- 1/libavcodec/x86/cavsdsp.c
--- 2/libavcodec/x86/cavsdsp.c
+++ b/libavcodec/x86/cavsdsp.c
@@@ -136,10 -136,10 +136,10 @@@ static inline void cavs_idct8_1d(int16_
      SBUTTERFLY(a,c,d,dq,q) /* a=aeim d=bfjn */\
      SBUTTERFLY(t,b,c,dq,q) /* t=cgko c=dhlp */
  
- static void cavs_idct8_add_mmx(uint8_t *dst, int16_t *block, int stride)
+ static void cavs_idct8_add_mmx(uint8_t *dst, int16_t *block, ptrdiff_t stride)
  {
      int i;
 -    DECLARE_ALIGNED(8, int16_t, b2)[64];
 +    LOCAL_ALIGNED(16, int16_t, b2, [64]);
  
      for(i=0; i<2; i++){
          cavs_idct8_1d(block + 4 * i, ff_pw_4.a);
@@@ -386,11 -385,13 +388,13 @@@ static inline void OPNAME ## cavs_qpel8
    QPEL_CAVSVNUM(QPEL_CAVSV1,OP,ff_pw_64,ff_pw_96,ff_pw_42)      \
  }\
  \
- static inline void OPNAME ## cavs_qpel8or16_v2_ ## MMX(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h){\
+ static inline void OPNAME ## cavs_qpel8or16_v2_ ## MMX(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride, int h)\
+ {                                                                       \
 -  QPEL_CAVSVNUM(QPEL_CAVSV2,OP,ff_pw_4,ff_pw_5,ff_pw_5)         \
 +  QPEL_CAVSVNUM(QPEL_CAVSV2,OP,ff_pw_4,ff_pw_5,ff_pw_42)        \
  }\
  \
- static inline void OPNAME ## cavs_qpel8or16_v3_ ## MMX(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h){\
+ static inline void OPNAME ## cavs_qpel8or16_v3_ ## MMX(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride, int h)\
+ {                                                                       \
    QPEL_CAVSVNUM(QPEL_CAVSV3,OP,ff_pw_64,ff_pw_96,ff_pw_42)      \
  }\
  \