Merge commit 'd9d26a3674f31f482f54e936fcb382160830877a'
authorJames Almer <jamrial@gmail.com>
Sun, 19 Mar 2017 17:54:25 +0000 (14:54 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 19 Mar 2017 17:54:25 +0000 (14:54 -0300)
* commit 'd9d26a3674f31f482f54e936fcb382160830877a':
  vp56: Change type of stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/arm/vp6dsp_init_arm.c
libavcodec/vp56.h
libavcodec/vp56dsp.c
libavcodec/vp56dsp.h
libavcodec/vp6.c
libavcodec/vp6dsp.c
libavcodec/x86/vp6dsp.asm
libavcodec/x86/vp6dsp_init.c

Simple merge
@@@ -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);
Simple merge
Simple merge
@@@ -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;
Simple merge
Simple merge
Simple merge