Merge commit '87c6c78604e4dd16f1f45862b27ca006da010527'

* commit '87c6c78604e4dd16f1f45862b27ca006da010527':
  vp8: Change type of stride parameters to ptrdiff_t

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

diff --cc libavcodec/vp8.c
index 068223920e40c5d9016cb12194a22e1b7cf461a8,546124cdf245e53a58ee73152e9ca1eecdeb98aa..1e8808c46fd1bde79e37ca74a4124dcafff69655
--- 1/libavcodec/vp8.c
--- 2/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@@ -435,9 -425,8 +435,9 @@@ static void copy_chroma(AVFrame *dst, A
      }
  }
  
- static void fade(uint8_t *dst, int dst_linesize,
-                  const uint8_t *src, int src_linesize,
 -static void fade(uint8_t *dst, uint8_t *src,
 -                 int width, int height, ptrdiff_t linesize,
++static void fade(uint8_t *dst, ptrdiff_t dst_linesize,
++                 const uint8_t *src, ptrdiff_t src_linesize,
 +                 int width, int height,
                   int alpha, int beta)
  {
      int i, j;
@@@ -1632,9 -1591,10 +1632,10 @@@ void intra_predict(VP8Context *s, VP8Th
          for (y = 0; y < 4; y++) {
              uint8_t *topright = ptr + 4 - s->linesize;
              for (x = 0; x < 4; x++) {
-                 int copy = 0, linesize = s->linesize;
+                 int copy = 0;
+                 ptrdiff_t linesize = s->linesize;
                  uint8_t *dst = ptr + 4 * x;
 -                DECLARE_ALIGNED(4, uint8_t, copy_dst)[5 * 8];
 +                LOCAL_ALIGNED(4, uint8_t, copy_dst, [5 * 8]);
  
                  if ((y == 0 || x == 3) && mb_y == 0) {
                      topright = tr_top;
@@@ -1738,10 -1698,10 +1739,10 @@@ void vp8_mc_luma(VP8Context *s, VP8Thre
      uint8_t *src = ref->f->data[0];
  
      if (AV_RN32A(mv)) {
-         int src_linesize = linesize;
+         ptrdiff_t src_linesize = linesize;
  
 -        int mx = (mv->x << 1) & 7, mx_idx = subpel_idx[0][mx];
 -        int my = (mv->y << 1) & 7, my_idx = subpel_idx[0][my];
 +        int mx = (mv->x * 2) & 7, mx_idx = subpel_idx[0][mx];
 +        int my = (mv->y * 2) & 7, my_idx = subpel_idx[0][my];
  
          x_off += mv->x >> 2;
          y_off += mv->y >> 2;

diff --cc libavcodec/vp8.h
Simple merge

diff --cc tests/checkasm/vp8dsp.c
Simple merge