Skip to content

F
ffmpeg.wasm-core
Commit 21c18b08 authored by Clément Bœsch's avatar Clément Bœsch
Browse files
Options

Merge commit '73f5e17a' 

* commit '73f5e17a':
  copy_block: Change type of array stride parameters to ptrdiff_t
Merged-by: 's avatarClément Bœsch <u@pkh.me>
parents e59d8d03 73f5e17a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
libavcodec/copy_block.h
View file @ 21c18b08
...@@ -19,11 +19,12 @@ ...@@ -19,11 +19,12 @@
#ifndef AVCODEC_COPY_BLOCK_H #ifndef AVCODEC_COPY_BLOCK_H
#define AVCODEC_COPY_BLOCK_H #define AVCODEC_COPY_BLOCK_H
#include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include "libavutil/intreadwrite.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; int i;
for(i=0; i<h; 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, ...@@ -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; int i;
for (i = 0; i < h; 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, ...@@ -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; int i;
for (i = 0; i < h; 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, ...@@ -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; int i;
for (i = 0; i < h; 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, ...@@ -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; int i;
for (i = 0; i < h; 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, ...@@ -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; int i;
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment