RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Clément Bœsch 2017-03-20 09:22:36 +01:00
parent e59d8d030f 73f5e17a20
commit 21c18b0878
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/copy_block.h
View File

@ -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++) {