diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 00:00:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 00:00:16 +0100 |
| commit | a9b1936a4e46137c80c4c8300cfc68ca2a317b90 (patch) | |
| tree | fe38d73938aa85c3c8081c8d2980307f47e3debf /libavcodec/x86 | |
| parent | 1c788eaca9a0ad398d1b6ecc3797949ca84b42f9 (diff) | |
| parent | edd1f833fa145eb9c5026877c699ebe6efca00a0 (diff) | |
| download | ffmpeg-a9b1936a4e46137c80c4c8300cfc68ca2a317b90.tar.gz | |
Merge commit 'edd1f833fa145eb9c5026877c699ebe6efca00a0'
* commit 'edd1f833fa145eb9c5026877c699ebe6efca00a0':
x86: h264_idct_10_bit: Use proper type in function prototype comments
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/h264_idct_10bit.asm | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/libavcodec/x86/h264_idct_10bit.asm b/libavcodec/x86/h264_idct_10bit.asm index df212888dc..e6c7f46263 100644 --- a/libavcodec/x86/h264_idct_10bit.asm +++ b/libavcodec/x86/h264_idct_10bit.asm @@ -32,7 +32,7 @@ pd_32: times 4 dd 32 SECTION .text ;----------------------------------------------------------------------------- -; void h264_idct_add(pixel *dst, dctcoef *block, int stride) +; void h264_idct_add(pixel *dst, int16_t *block, int stride) ;----------------------------------------------------------------------------- %macro STORE_DIFFx2 6 psrad %1, 6 @@ -89,7 +89,8 @@ IDCT_ADD_10 %endif ;----------------------------------------------------------------------------- -; h264_idct_add16(pixel *dst, const int *block_offset, dctcoef *block, int stride, const uint8_t nnzc[6*8]) +; h264_idct_add16(pixel *dst, const int *block_offset, int16_t *block, +; int stride, const uint8_t nnzc[6*8]) ;----------------------------------------------------------------------------- ;;;;;;; NO FATE SAMPLES TRIGGER THIS %macro ADD4x4IDCT 0 @@ -163,7 +164,7 @@ IDCT_ADD16_10 %endif ;----------------------------------------------------------------------------- -; void h264_idct_dc_add(pixel *dst, dctcoef *block, int stride) +; void h264_idct_dc_add(pixel *dst, int16_t *block, int stride) ;----------------------------------------------------------------------------- %macro IDCT_DC_ADD_OP_10 3 pxor m5, m5 @@ -205,7 +206,7 @@ cglobal h264_idct_dc_add_10,3,3 RET ;----------------------------------------------------------------------------- -; void h264_idct8_dc_add(pixel *dst, dctcoef *block, int stride) +; void h264_idct8_dc_add(pixel *dst, int16_t *block, int stride) ;----------------------------------------------------------------------------- %macro IDCT8_DC_ADD 0 cglobal h264_idct8_dc_add_10,3,4,7 @@ -230,7 +231,8 @@ IDCT8_DC_ADD %endif ;----------------------------------------------------------------------------- -; h264_idct_add16intra(pixel *dst, const int *block_offset, dctcoef *block, int stride, const uint8_t nnzc[6*8]) +; h264_idct_add16intra(pixel *dst, const int *block_offset, int16_t *block, +; int stride, const uint8_t nnzc[6*8]) ;----------------------------------------------------------------------------- %macro AC 1 .ac%1: @@ -304,7 +306,8 @@ IDCT_ADD16INTRA_10 %assign last_block 36 ;----------------------------------------------------------------------------- -; h264_idct_add8(pixel **dst, const int *block_offset, dctcoef *block, int stride, const uint8_t nnzc[6*8]) +; h264_idct_add8(pixel **dst, const int *block_offset, int16_t *block, +; int stride, const uint8_t nnzc[6*8]) ;----------------------------------------------------------------------------- %macro IDCT_ADD8 0 cglobal h264_idct_add8_10,5,8,7 @@ -340,7 +343,7 @@ IDCT_ADD8 %endif ;----------------------------------------------------------------------------- -; void h264_idct8_add(pixel *dst, dctcoef *block, int stride) +; void h264_idct8_add(pixel *dst, int16_t *block, int stride) ;----------------------------------------------------------------------------- %macro IDCT8_1D 2 SWAP 0, 1 @@ -549,7 +552,8 @@ IDCT8_ADD %endif ;----------------------------------------------------------------------------- -; h264_idct8_add4(pixel **dst, const int *block_offset, dctcoef *block, int stride, const uint8_t nnzc[6*8]) +; h264_idct8_add4(pixel **dst, const int *block_offset, int16_t *block, +; int stride, const uint8_t nnzc[6*8]) ;----------------------------------------------------------------------------- ;;;;;;; NO FATE SAMPLES TRIGGER THIS %macro IDCT8_ADD4_OP 2 |