summaryrefslogtreecommitdiff
path: root/libavcodec/arm/simple_idct_armv6.S
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-03-21 14:29:52 -0300
committerJames Almer <jamrial@gmail.com>2017-03-21 14:29:52 -0300
commit5a49097b42cbc3eab888d15a91eeaf5520b5c381 (patch)
tree080300f20bca98deac895f2ca86a25b72a8428e8 /libavcodec/arm/simple_idct_armv6.S
parent2c8a3aa985acc906ecab37357f2798da7cb9822d (diff)
parent2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428 (diff)
Merge commit '2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428'
* commit '2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428': idct: Change type of array stride parameters to ptrdiff_t Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/arm/simple_idct_armv6.S')
-rw-r--r--libavcodec/arm/simple_idct_armv6.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/simple_idct_armv6.S b/libavcodec/arm/simple_idct_armv6.S
index 79cf5d41fb..f95c20d295 100644
--- a/libavcodec/arm/simple_idct_armv6.S
+++ b/libavcodec/arm/simple_idct_armv6.S
@@ -390,7 +390,7 @@ function ff_simple_idct_armv6, export=1
pop {r4-r11, pc}
endfunc
-/* ff_simple_idct_add_armv6(uint8_t *dest, int line_size, int16_t *data); */
+/* ff_simple_idct_add_armv6(uint8_t *dest, ptrdiff_t line_size, int16_t *data); */
function ff_simple_idct_add_armv6, export=1
push {r0, r1, r4-r11, lr}
sub sp, sp, #128
@@ -407,7 +407,7 @@ function ff_simple_idct_add_armv6, export=1
pop {r4-r11, pc}
endfunc
-/* ff_simple_idct_put_armv6(uint8_t *dest, int line_size, int16_t *data); */
+/* ff_simple_idct_put_armv6(uint8_t *dest, ptrdiff_t line_size, int16_t *data); */
function ff_simple_idct_put_armv6, export=1
push {r0, r1, r4-r11, lr}
sub sp, sp, #128