Merge commit 'd9d26a3674f31f482f54e936fcb382160830877a'

* commit 'd9d26a3674f31f482f54e936fcb382160830877a':
  vp56: Change type of stride parameters to ptrdiff_t

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

diff --cc libavcodec/arm/vp6dsp_init_arm.c
Simple merge

diff --cc libavcodec/vp56.h
index c049399df8ffa41faad410ed313594ce8414b526,52fe3182f4a69543940371619601a57238c042b2..aacbe74a6b8a295672396a1631022fe140891d63
--- 1/libavcodec/vp56.h
--- 2/libavcodec/vp56.h
+++ b/libavcodec/vp56.h
@@@ -72,9 -72,9 +72,9 @@@ typedef struct VP56mv 
  typedef void (*VP56ParseVectorAdjustment)(VP56Context *s,
                                            VP56mv *vect);
  typedef void (*VP56Filter)(VP56Context *s, uint8_t *dst, uint8_t *src,
-                            int offset1, int offset2, int stride,
+                            int offset1, int offset2, ptrdiff_t stride,
                             VP56mv mv, int mask, int select, int luma);
 -typedef void (*VP56ParseCoeff)(VP56Context *s);
 +typedef int  (*VP56ParseCoeff)(VP56Context *s);
  typedef void (*VP56DefaultModelsInit)(VP56Context *s);
  typedef void (*VP56ParseVectorModels)(VP56Context *s);
  typedef int  (*VP56ParseCoeffModels)(VP56Context *s);

diff --cc libavcodec/vp56dsp.c
Simple merge

diff --cc libavcodec/vp56dsp.h
Simple merge

diff --cc libavcodec/vp6.c
index 4afd67b3a47f199bff5648f59ded66e0db0ba02c,aa0d09effbc81392eb7bae4101bb3e9e70fa43d1..c7e8f13282ae54364ad12213b2672608e12e44da
--- 1/libavcodec/vp6.c
--- 2/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@@ -528,10 -512,9 +528,10 @@@ static int vp6_parse_coeff(VP56Context 
          s->left_block[ff_vp56_b6to4[b]].not_null_dc =
          s->above_blocks[s->above_block_idx[b]].not_null_dc = !!s->block_coeff[b][0];
      }
 +    return 0;
  }
  
- static int vp6_block_variance(uint8_t *src, int stride)
+ static int vp6_block_variance(uint8_t *src, ptrdiff_t stride)
  {
      int sum = 0, square_sum = 0;
      int y, x;

diff --cc libavcodec/vp6dsp.c
Simple merge

diff --cc libavcodec/x86/vp6dsp.asm
Simple merge

diff --cc libavcodec/x86/vp6dsp_init.c
Simple merge