diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-09-21 03:34:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-09-23 04:10:44 +0200 |
| commit | bc26fe89275c267d169b468356c82ee59874407d (patch) | |
| tree | 3ca02c6f344bb00917f301378b8571f8dd5f81d3 /libavcodec/x86 | |
| parent | 289a6bb8b11822aaea1b174d5d938a081e19a084 (diff) | |
| download | ffmpeg-bc26fe89275c267d169b468356c82ee59874407d.tar.gz | |
avcodec/h264: Use ptrdiff_t for (bi)weight functions
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/h264dsp_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index c8cd0650c7..d2452c7131 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -157,13 +157,13 @@ LF_IFUNC(v, luma_intra, 10, mmxext) /* weighted prediction */ #define H264_WEIGHT(W, OPT) \ -void ff_h264_weight_ ## W ## _ ## OPT(uint8_t *dst, int stride, \ +void ff_h264_weight_ ## W ## _ ## OPT(uint8_t *dst, ptrdiff_t stride, \ int height, int log2_denom, \ int weight, int offset); #define H264_BIWEIGHT(W, OPT) \ void ff_h264_biweight_ ## W ## _ ## OPT(uint8_t *dst, uint8_t *src, \ - int stride, int height, \ + ptrdiff_t stride, int height, \ int log2_denom, int weightd, \ int weights, int offset); @@ -183,7 +183,7 @@ H264_BIWEIGHT_MMX(4) #define H264_WEIGHT_10(W, DEPTH, OPT) \ void ff_h264_weight_ ## W ## _ ## DEPTH ## _ ## OPT(uint8_t *dst, \ - int stride, \ + ptrdiff_t stride, \ int height, \ int log2_denom, \ int weight, \ @@ -192,7 +192,7 @@ void ff_h264_weight_ ## W ## _ ## DEPTH ## _ ## OPT(uint8_t *dst, \ #define H264_BIWEIGHT_10(W, DEPTH, OPT) \ void ff_h264_biweight_ ## W ## _ ## DEPTH ## _ ## OPT(uint8_t *dst, \ uint8_t *src, \ - int stride, \ + ptrdiff_t stride, \ int height, \ int log2_denom, \ int weightd, \ |