summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-09-08 15:13:04 +0200
committerDiego Biurrun <diego@biurrun.de>2016-09-29 14:48:03 +0200
commitb2939a75270bc7e971462648168aa3a2a48c1c8c (patch)
treefed2c4b0ef2b3942aaec5d8138aca36fa3700bb3
parent3281d823cdc7601c4900eb103958c05f59f65555 (diff)
downloadffmpeg-streaming-b2939a75270bc7e971462648168aa3a2a48c1c8c.zip
ffmpeg-streaming-b2939a75270bc7e971462648168aa3a2a48c1c8c.tar.gz
blockdsp: Change type of array stride parameters to ptrdiff_t
ptrdiff_t is the correct type for array strides and similar.
-rw-r--r--libavcodec/blockdsp.c6
-rw-r--r--libavcodec/blockdsp.h3
2 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/blockdsp.c b/libavcodec/blockdsp.c
index a35df8c..2c396f1 100644
--- a/libavcodec/blockdsp.c
+++ b/libavcodec/blockdsp.c
@@ -35,7 +35,8 @@ static void clear_blocks_8_c(int16_t *blocks)
memset(blocks, 0, sizeof(int16_t) * 6 * 64);
}
-static void fill_block16_c(uint8_t *block, uint8_t value, int line_size, int h)
+static void fill_block16_c(uint8_t *block, uint8_t value, ptrdiff_t line_size,
+ int h)
{
int i;
@@ -45,7 +46,8 @@ static void fill_block16_c(uint8_t *block, uint8_t value, int line_size, int h)
}
}
-static void fill_block8_c(uint8_t *block, uint8_t value, int line_size, int h)
+static void fill_block8_c(uint8_t *block, uint8_t value, ptrdiff_t line_size,
+ int h)
{
int i;
diff --git a/libavcodec/blockdsp.h b/libavcodec/blockdsp.h
index 5b5639f..e555d29 100644
--- a/libavcodec/blockdsp.h
+++ b/libavcodec/blockdsp.h
@@ -19,6 +19,7 @@
#ifndef AVCODEC_BLOCKDSP_H
#define AVCODEC_BLOCKDSP_H
+#include <stddef.h>
#include <stdint.h>
#include "avcodec.h"
@@ -29,7 +30,7 @@
* h for op_pixels_func is limited to { width / 2, width },
* but never larger than 16 and never smaller than 4. */
typedef void (*op_fill_func)(uint8_t *block /* align width (8 or 16) */,
- uint8_t value, int line_size, int h);
+ uint8_t value, ptrdiff_t line_size, int h);
typedef struct BlockDSPContext {
void (*clear_block)(int16_t *block /* align 16 */);
OpenPOWER on IntegriCloud