diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-21 15:10:46 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-21 15:10:46 +0100 |
| commit | 51b5672f49f54fbdeaf9828de1f806b1243a6e3d (patch) | |
| tree | a7314cb211ec95aa7e8a9f15e20d7fbec2c528d5 | |
| parent | f54da138e98ca9f0de1fa9d9ff7e05a91553ab57 (diff) | |
| parent | 92c5755a185086067fe49e7e64c23a8e7011be31 (diff) | |
| download | ffmpeg-51b5672f49f54fbdeaf9828de1f806b1243a6e3d.tar.gz | |
Merge commit '92c5755a185086067fe49e7e64c23a8e7011be31'
* commit '92c5755a185086067fe49e7e64c23a8e7011be31':
hpeldsp: arm: Update comments left behind in 25841dfe806a13de526ae09c11149ab1f83555a8
Merged-by: Clément Bœsch <u@pkh.me>
| -rw-r--r-- | libavcodec/arm/hpeldsp_arm.S | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/arm/hpeldsp_arm.S b/libavcodec/arm/hpeldsp_arm.S index 219f793d99..6f3e3fb0d1 100644 --- a/libavcodec/arm/hpeldsp_arm.S +++ b/libavcodec/arm/hpeldsp_arm.S @@ -90,7 +90,7 @@ @ ---------------------------------------------------------------- function ff_put_pixels16_arm, export=1, align=5 - @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ void func(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] push {r4-r11, lr} @@ -141,7 +141,7 @@ endfunc @ ---------------------------------------------------------------- function ff_put_pixels8_arm, export=1, align=5 - @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ void func(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] push {r4-r5,lr} @@ -192,7 +192,7 @@ endfunc @ ---------------------------------------------------------------- function ff_put_pixels8_x2_arm, export=1, align=5 - @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ void func(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] push {r4-r10,lr} @@ -250,7 +250,7 @@ function ff_put_pixels8_x2_arm, export=1, align=5 endfunc function ff_put_no_rnd_pixels8_x2_arm, export=1, align=5 - @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ void func(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] push {r4-r10,lr} @@ -310,7 +310,7 @@ endfunc @ ---------------------------------------------------------------- function ff_put_pixels8_y2_arm, export=1, align=5 - @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ void func(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] push {r4-r11,lr} @@ -407,7 +407,7 @@ function ff_put_pixels8_y2_arm, export=1, align=5 endfunc function ff_put_no_rnd_pixels8_y2_arm, export=1, align=5 - @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ void func(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] push {r4-r11,lr} @@ -573,7 +573,7 @@ endfunc .endm function ff_put_pixels8_xy2_arm, export=1, align=5 - @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ void func(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] push {r4-r11,lr} @ R14 is also called LR @@ -588,7 +588,7 @@ function ff_put_pixels8_xy2_arm, export=1, align=5 endfunc function ff_put_no_rnd_pixels8_xy2_arm, export=1, align=5 - @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ void func(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] push {r4-r11,lr} |