diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-19 15:18:31 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-19 15:18:31 -0300 |
| commit | 4e4dfcac58f3a582479319175ae3d17f337643c0 (patch) | |
| tree | b3e935d167c58adbb73c2272ae5580b8fc23a533 /libavcodec/arm | |
| parent | e5623aafd8f6cba710f714e1d22c13d4a699792b (diff) | |
| parent | 802727b538b484e3f9d1345bfcc4ab24cfea8898 (diff) | |
| download | ffmpeg-4e4dfcac58f3a582479319175ae3d17f337643c0.tar.gz | |
Merge commit '802727b538b484e3f9d1345bfcc4ab24cfea8898'
* commit '802727b538b484e3f9d1345bfcc4ab24cfea8898':
vp8: Update some assembly comments left unchanged in bd66f073fe7286bd3c
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/vp8dsp_armv6.S | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/arm/vp8dsp_armv6.S b/libavcodec/arm/vp8dsp_armv6.S index adecd1ce93..2320bf4d23 100644 --- a/libavcodec/arm/vp8dsp_armv6.S +++ b/libavcodec/arm/vp8dsp_armv6.S @@ -192,7 +192,7 @@ function ff_vp8_luma_dc_wht_dc_armv6, export=1 bx lr endfunc -@ void vp8_idct_add(uint8_t *dst, int16_t block[16], int stride) +@ void vp8_idct_add(uint8_t *dst, int16_t block[16], ptrdiff_t stride) function ff_vp8_idct_add_armv6, export=1 push {r4-r12, lr} sub sp, sp, #32 @@ -314,7 +314,7 @@ function ff_vp8_idct_add_armv6, export=1 pop {r4-r12, pc} endfunc -@ void vp8_idct_dc_add(uint8_t *dst, int16_t block[16], int stride) +@ void vp8_idct_dc_add(uint8_t *dst, int16_t block[16], ptrdiff_t stride) function ff_vp8_idct_dc_add_armv6, export=1 push {r4-r6, lr} add r6, r0, r2, lsl #1 @@ -355,7 +355,7 @@ function ff_vp8_idct_dc_add_armv6, export=1 pop {r4-r6, pc} endfunc -@ void vp8_idct_dc_add4uv(uint8_t *dst, int16_t block[4][16], int stride) +@ void vp8_idct_dc_add4uv(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride) function ff_vp8_idct_dc_add4uv_armv6, export=1 push {r4, lr} @@ -371,7 +371,7 @@ function ff_vp8_idct_dc_add4uv_armv6, export=1 pop {r4, pc} endfunc -@ void vp8_idct_dc_add4y(uint8_t *dst, int16_t block[4][16], int stride) +@ void vp8_idct_dc_add4y(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride) function ff_vp8_idct_dc_add4y_armv6, export=1 push {r4, lr} @@ -455,7 +455,7 @@ endfunc eor r5, r5, r2 @ *oq0 = u ^ 0x80 .endm -@ void vp8_v_loop_filter16_simple(uint8_t *dst, int stride, int flim) +@ void vp8_v_loop_filter16_simple(uint8_t *dst, ptrdiff_t stride, int flim) function ff_vp8_v_loop_filter16_simple_armv6, export=1 push {r4-r11, lr} @@ -866,7 +866,7 @@ function ff_vp8_v_loop_filter8uv_armv6, export=1 b vp8_v_loop_filter_armv6 endfunc -@ void vp8_h_loop_filter16_simple(uint8_t *dst, int stride, int flim) +@ void vp8_h_loop_filter16_simple(uint8_t *dst, ptrdiff_t stride, int flim) function ff_vp8_h_loop_filter16_simple_armv6, export=1 push {r4-r11, lr} orr r12, r2, r2, lsl #16 @@ -1113,8 +1113,8 @@ endfunc @ MC -@ void put_vp8_pixels16(uint8_t *dst, int dststride, uint8_t *src, -@ int srcstride, int h, int mx, int my) +@ void put_vp8_pixels16(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, +@ ptrdiff_t srcstride, int h, int mx, int my) function ff_put_vp8_pixels16_armv6, export=1 push {r4-r11} ldr r12, [sp, #32] @ h @@ -1137,8 +1137,8 @@ function ff_put_vp8_pixels16_armv6, export=1 bx lr endfunc -@ void put_vp8_pixels8(uint8_t *dst, int dststride, uint8_t *src, -@ int srcstride, int h, int mx, int my) +@ void put_vp8_pixels8(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, +@ ptrdiff_t srcstride, int h, int mx, int my) function ff_put_vp8_pixels8_armv6, export=1 push {r4-r11} ldr r12, [sp, #32] @ h @@ -1161,8 +1161,8 @@ function ff_put_vp8_pixels8_armv6, export=1 bx lr endfunc -@ void put_vp8_pixels4(uint8_t *dst, int dststride, uint8_t *src, -@ int srcstride, int h, int mx, int my) +@ void put_vp8_pixels4(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, +@ ptrdiff_t srcstride, int h, int mx, int my) function ff_put_vp8_pixels4_armv6, export=1 ldr r12, [sp, #0] @ h push {r4-r6,lr} |