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/arm/pixblockdsp_init_arm.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/arm/pixblockdsp_init_arm.c')
| -rw-r--r-- | libavcodec/arm/pixblockdsp_init_arm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/arm/pixblockdsp_init_arm.c b/libavcodec/arm/pixblockdsp_init_arm.c index 76d7509728..59d2b49381 100644 --- a/libavcodec/arm/pixblockdsp_init_arm.c +++ b/libavcodec/arm/pixblockdsp_init_arm.c @@ -24,9 +24,10 @@ #include "libavcodec/avcodec.h" #include "libavcodec/pixblockdsp.h" -void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels, ptrdiff_t stride); +void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels, + ptrdiff_t stride); void ff_diff_pixels_armv6(int16_t *block, const uint8_t *s1, - const uint8_t *s2, int stride); + const uint8_t *s2, ptrdiff_t stride); av_cold void ff_pixblockdsp_init_arm(PixblockDSPContext *c, AVCodecContext *avctx, |