diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 00:01:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 00:01:30 +0100 |
| commit | 4104eb44e629d1469918e73587649fd3b2d992ba (patch) | |
| tree | 483dacda734e81247a01f747dea59f93c5f452db /libavcodec/x86/fpel.asm | |
| parent | a9b1936a4e46137c80c4c8300cfc68ca2a317b90 (diff) | |
| parent | 55519926ef855c671d084ccc151056de9e3d3a77 (diff) | |
| download | ffmpeg-4104eb44e629d1469918e73587649fd3b2d992ba.tar.gz | |
Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'
* commit '55519926ef855c671d084ccc151056de9e3d3a77':
x86: Make function prototype comments in assembly code consistent
Conflicts:
libavcodec/x86/sbrdsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/fpel.asm')
| -rw-r--r-- | libavcodec/x86/fpel.asm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/x86/fpel.asm b/libavcodec/x86/fpel.asm index bfabcee5e3..de6b1d6c1b 100644 --- a/libavcodec/x86/fpel.asm +++ b/libavcodec/x86/fpel.asm @@ -26,7 +26,8 @@ SECTION .text INIT_MMX mmxext -; void pixels(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) +; void ff_put/avg_pixels(uint8_t *block, const uint8_t *pixels, +; ptrdiff_t line_size, int h) %macro PIXELS48 2 %if %2 == 4 %define OP movh @@ -65,7 +66,8 @@ PIXELS48 avg, 8 INIT_XMM sse2 -; void put_pixels16_sse2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) +; void ff_put_pixels16_sse2(uint8_t *block, const uint8_t *pixels, +; ptrdiff_t line_size, int h) cglobal put_pixels16, 4,5,4 lea r4, [r2*3] .loop: @@ -83,7 +85,8 @@ cglobal put_pixels16, 4,5,4 jnz .loop REP_RET -; void avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) +; void ff_avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels, +; ptrdiff_t line_size, int h) cglobal avg_pixels16, 4,5,4 lea r4, [r2*3] .loop: |