diff options
author | Clément Bœsch <u@pkh.me> | 2017-03-20 13:47:29 +0100 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-03-20 15:58:32 +0100 |
commit | e07fa3008bcafc027e9aa654657bae1f1ac64f5d (patch) | |
tree | fdc9dc3b4e4565b2a7b4a27a0ccbe77ab65e22b0 /libavcodec/x86/pixblockdsp_init.c | |
parent | ce818d90bdb28d8591e6b81e020d1e7f87536649 (diff) | |
parent | de452e503734ebb0fdbce86e9d16693b3530fad3 (diff) | |
download | ffmpeg-e07fa3008bcafc027e9aa654657bae1f1ac64f5d.tar.gz |
Merge commit 'de452e503734ebb0fdbce86e9d16693b3530fad3'
* commit 'de452e503734ebb0fdbce86e9d16693b3530fad3':
pixblockdsp: Change type of stride parameters to ptrdiff_t
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/x86/pixblockdsp_init.c')
-rw-r--r-- | libavcodec/x86/pixblockdsp_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/pixblockdsp_init.c b/libavcodec/x86/pixblockdsp_init.c index 4d06a44c6d..fa9578a2d3 100644 --- a/libavcodec/x86/pixblockdsp_init.c +++ b/libavcodec/x86/pixblockdsp_init.c @@ -23,12 +23,12 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/pixblockdsp.h" -void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size); -void ff_get_pixels_sse2(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size); +void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, ptrdiff_t stride); +void ff_get_pixels_sse2(int16_t *block, const uint8_t *pixels, ptrdiff_t stride); void ff_diff_pixels_mmx(int16_t *block, const uint8_t *s1, const uint8_t *s2, - int stride); + ptrdiff_t stride); void ff_diff_pixels_sse2(int16_t *block, const uint8_t *s1, const uint8_t *s2, - int stride); + ptrdiff_t stride); av_cold void ff_pixblockdsp_init_x86(PixblockDSPContext *c, AVCodecContext *avctx, |