summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264dsp_template.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-09-21 03:34:51 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-09-23 04:10:44 +0200
commitbc26fe89275c267d169b468356c82ee59874407d (patch)
tree3ca02c6f344bb00917f301378b8571f8dd5f81d3 /libavcodec/h264dsp_template.c
parent289a6bb8b11822aaea1b174d5d938a081e19a084 (diff)
downloadffmpeg-streaming-bc26fe89275c267d169b468356c82ee59874407d.zip
ffmpeg-streaming-bc26fe89275c267d169b468356c82ee59874407d.tar.gz
avcodec/h264: Use ptrdiff_t for (bi)weight functions
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/h264dsp_template.c')
-rw-r--r--libavcodec/h264dsp_template.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264dsp_template.c b/libavcodec/h264dsp_template.c
index d9dcf6b..0288cc7 100644
--- a/libavcodec/h264dsp_template.c
+++ b/libavcodec/h264dsp_template.c
@@ -30,7 +30,7 @@
#define op_scale1(x) block[x] = av_clip_pixel( (block[x]*weight + offset) >> log2_denom )
#define op_scale2(x) dst[x] = av_clip_pixel( (src[x]*weights + dst[x]*weightd + offset) >> (log2_denom+1))
#define H264_WEIGHT(W) \
-static void FUNCC(weight_h264_pixels ## W)(uint8_t *_block, int stride, int height, \
+static void FUNCC(weight_h264_pixels ## W)(uint8_t *_block, ptrdiff_t stride, int height, \
int log2_denom, int weight, int offset) \
{ \
int y; \
@@ -60,7 +60,7 @@ static void FUNCC(weight_h264_pixels ## W)(uint8_t *_block, int stride, int heig
op_scale1(15); \
} \
} \
-static void FUNCC(biweight_h264_pixels ## W)(uint8_t *_dst, uint8_t *_src, int stride, int height, \
+static void FUNCC(biweight_h264_pixels ## W)(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride, int height, \
int log2_denom, int weightd, int weights, int offset) \
{ \
int y; \
OpenPOWER on IntegriCloud