diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-21 15:20:45 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-21 15:20:45 -0300 |
| commit | a8474df9447d6466c77d3ec8f414cda2662f057b (patch) | |
| tree | 508b0b6cbb90c13e0a9ff44023f5df96b21420fd /libavcodec/arm/vc1dsp_init_neon.c | |
| parent | 5a49097b42cbc3eab888d15a91eeaf5520b5c381 (diff) | |
| parent | e4a94d8b36c48d95a7d412c40d7b558422ff659c (diff) | |
Merge commit 'e4a94d8b36c48d95a7d412c40d7b558422ff659c'
* commit 'e4a94d8b36c48d95a7d412c40d7b558422ff659c':
h264chroma: Change type of stride parameters to ptrdiff_t
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/arm/vc1dsp_init_neon.c')
| -rw-r--r-- | libavcodec/arm/vc1dsp_init_neon.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/arm/vc1dsp_init_neon.c b/libavcodec/arm/vc1dsp_init_neon.c index c3401441eb..005d45ce8f 100644 --- a/libavcodec/arm/vc1dsp_init_neon.c +++ b/libavcodec/arm/vc1dsp_init_neon.c @@ -70,14 +70,14 @@ DECL_PUT(3, 1) DECL_PUT(3, 2) DECL_PUT(3, 3) -void ff_put_vc1_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, int h, - int x, int y); -void ff_avg_vc1_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, int h, - int x, int y); -void ff_put_vc1_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, int h, - int x, int y); -void ff_avg_vc1_chroma_mc4_neon(uint8_t *dst, uint8_t *src, int stride, int h, - int x, int y); +void ff_put_vc1_chroma_mc8_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride, + int h, int x, int y); +void ff_avg_vc1_chroma_mc8_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride, + int h, int x, int y); +void ff_put_vc1_chroma_mc4_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride, + int h, int x, int y); +void ff_avg_vc1_chroma_mc4_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride, + int h, int x, int y); #define FN_ASSIGN(X, Y) \ dsp->put_vc1_mspel_pixels_tab[0][X+4*Y] = ff_put_vc1_mspel_mc##X##Y##_16_neon; \ |