Merge commit '73f5e17a203713c4ac4e5a821809823b383b195f'

* commit '73f5e17a203713c4ac4e5a821809823b383b195f':
  copy_block: Change type of array stride parameters to ptrdiff_t

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

diff --cc libavcodec/copy_block.h
index 9ed451f29409a39f29eff53e3977f11eb976680f,0b6962238522fee39d4c7e7c52c2a26f69c870b5..4d6ef262d1397cab5568973ae110f916a3fceff4
--- 1/libavcodec/copy_block.h
--- 2/libavcodec/copy_block.h
+++ b/libavcodec/copy_block.h
@@@ -23,18 -24,7 +24,18 @@@
  
  #include "libavutil/intreadwrite.h"
  
- static inline void copy_block2(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
++static inline void copy_block2(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride, int h)
 +{
 +    int i;
 +    for(i=0; i<h; i++)
 +    {
 +        AV_COPY16U(dst, src);
 +        dst+=dstStride;
 +        src+=srcStride;
 +    }
 +}
 +
- static inline void copy_block4(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
+ static inline void copy_block4(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride, int h)
  {
      int i;
      for (i = 0; i < h; i++) {