[FFmpeg-cvslog] Merge commit '73f5e17a203713c4ac4e5a821809823b383b195f'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 20 09:22:36 2017 +0100| [21c18b087822c47028b2fbdb51965ee6dbe0e296] | committer: Clément Bœsch

Merge commit '73f5e17a203713c4ac4e5a821809823b383b195f'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21c18b087822c47028b2fbdb51965ee6dbe0e296
---

 libavcodec/copy_block.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libavcodec/copy_block.h b/libavcodec/copy_block.h
index 9ed451f..4d6ef26 100644
--- a/libavcodec/copy_block.h
+++ b/libavcodec/copy_block.h
@@ -19,11 +19,12 @@
 #ifndef AVCODEC_COPY_BLOCK_H
 #define AVCODEC_COPY_BLOCK_H
 
+#include <stddef.h>
 #include <stdint.h>
 
 #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++)
@@ -34,7 +35,7 @@ static inline void copy_block2(uint8_t *dst, const uint8_t *src, int dstStride,
     }
 }
 
-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++) {
@@ -44,7 +45,7 @@ static inline void copy_block4(uint8_t *dst, const uint8_t *src, int dstStride,
     }
 }
 
-static inline void copy_block8(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
+static inline void copy_block8(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride, int h)
 {
     int i;
     for (i = 0; i < h; i++) {
@@ -54,7 +55,7 @@ static inline void copy_block8(uint8_t *dst, const uint8_t *src, int dstStride,
     }
 }
 
-static inline void copy_block9(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
+static inline void copy_block9(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride, int h)
 {
     int i;
     for (i = 0; i < h; i++) {
@@ -65,7 +66,7 @@ static inline void copy_block9(uint8_t *dst, const uint8_t *src, int dstStride,
     }
 }
 
-static inline void copy_block16(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
+static inline void copy_block16(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride, int h)
 {
     int i;
     for (i = 0; i < h; i++) {
@@ -75,7 +76,7 @@ static inline void copy_block16(uint8_t *dst, const uint8_t *src, int dstStride,
     }
 }
 
-static inline void copy_block17(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
+static inline void copy_block17(uint8_t *dst, const uint8_t *src, ptrdiff_t dstStride, ptrdiff_t srcStride, int h)
 {
     int i;
     for (i = 0; i < h; i++) {


======================================================================

diff --cc libavcodec/copy_block.h
index 9ed451f,0b69622..4d6ef26
--- a/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++) {