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/h264cmc_neon.S | |
| 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/h264cmc_neon.S')
| -rw-r--r-- | libavcodec/arm/h264cmc_neon.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/h264cmc_neon.S b/libavcodec/arm/h264cmc_neon.S index fc48a6f8f6..5a4159eedd 100644 --- a/libavcodec/arm/h264cmc_neon.S +++ b/libavcodec/arm/h264cmc_neon.S @@ -20,7 +20,7 @@ #include "libavutil/arm/asm.S" -/* chroma_mc8(uint8_t *dst, uint8_t *src, int stride, int h, int x, int y) */ +/* chroma_mc8(uint8_t *dst, uint8_t *src, ptrdiff_t stride, int h, int x, int y) */ .macro h264_chroma_mc8 type, codec=h264 function ff_\type\()_\codec\()_chroma_mc8_neon, export=1 push {r4-r7, lr} @@ -195,7 +195,7 @@ T cmp r7, #0 endfunc .endm -/* chroma_mc4(uint8_t *dst, uint8_t *src, int stride, int h, int x, int y) */ +/* chroma_mc4(uint8_t *dst, uint8_t *src, ptrdiff_t stride, int h, int x, int y) */ .macro h264_chroma_mc4 type, codec=h264 function ff_\type\()_\codec\()_chroma_mc4_neon, export=1 push {r4-r7, lr} |