Merge commit '6892df9294d93322d43255ada299507465bc93c8'

* commit '6892df9294d93322d43255ada299507465bc93c8':
  vp3: Change type of stride parameters to ptrdiff_t

Merged-by: Clément Bœsch <u@pkh.me>

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

diff --cc libavcodec/ppc/vp3dsp_altivec.c
Simple merge

diff --cc libavcodec/vp3dsp.c
index 4b6c838b7092d056c6b36c5eeab3a584a4ba9013,459441ea0757c375005a667176f26c7115674855..fdaa292d3717b62897c0a718f855be76da488d05
--- 1/libavcodec/vp3dsp.c
--- 2/libavcodec/vp3dsp.c
+++ b/libavcodec/vp3dsp.c
@@@ -41,9 -42,9 +41,9 @@@
  #define xC6S2 25080
  #define xC7S1 12785
  
 -#define M(a, b) (((a) * (b)) >> 16)
 +#define M(a, b) ((int)((SUINT)(a) * (b)) >> 16)
  
- static av_always_inline void idct(uint8_t *dst, int stride,
+ static av_always_inline void idct(uint8_t *dst, ptrdiff_t stride,
                                    int16_t *input, int type)
  {
      int16_t *ip = input;

diff --cc libavcodec/vp3dsp.h
Simple merge

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

diff --cc libavcodec/x86/vp3dsp_init.c
index 2ece9ab7d54ea8b211696e3be788571d92322aee,043e10f720c9c51c8169f9cbef8c0ff616a791b3..1ba9576431add0cfb32e16c135bf41b7e53c8386
--- 1/libavcodec/x86/vp3dsp_init.c
--- 2/libavcodec/x86/vp3dsp_init.c
+++ b/libavcodec/x86/vp3dsp_init.c
@@@ -25,25 -23,21 +25,24 @@@
  #include "libavutil/x86/cpu.h"
  #include "libavcodec/avcodec.h"
  #include "libavcodec/vp3dsp.h"
 -#include "config.h"
  
- void ff_vp3_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block);
- void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block);
+ void ff_vp3_idct_put_mmx(uint8_t *dest, ptrdiff_t stride, int16_t *block);
+ void ff_vp3_idct_add_mmx(uint8_t *dest, ptrdiff_t stride, int16_t *block);
  
- void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, int16_t *block);
- void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, int16_t *block);
+ void ff_vp3_idct_put_sse2(uint8_t *dest, ptrdiff_t stride, int16_t *block);
+ void ff_vp3_idct_add_sse2(uint8_t *dest, ptrdiff_t stride, int16_t *block);
  
- void ff_vp3_idct_dc_add_mmxext(uint8_t *dest, int line_size,
-                                int16_t *block);
+ void ff_vp3_idct_dc_add_mmxext(uint8_t *dest, ptrdiff_t stride, int16_t *block);
  
- void ff_vp3_v_loop_filter_mmxext(uint8_t *src, int stride,
+ void ff_vp3_v_loop_filter_mmxext(uint8_t *src, ptrdiff_t stride,
                                   int *bounding_values);
- void ff_vp3_h_loop_filter_mmxext(uint8_t *src, int stride,
+ void ff_vp3_h_loop_filter_mmxext(uint8_t *src, ptrdiff_t stride,
                                   int *bounding_values);
  
 +void ff_put_vp_no_rnd_pixels8_l2_mmx(uint8_t *dst, const uint8_t *a,
 +                                     const uint8_t *b, ptrdiff_t stride,
 +                                     int h);
 +
  av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags)
  {
      int cpu_flags = av_get_cpu_flags();