diff options
author | Clément Bœsch <u@pkh.me> | 2016-06-21 21:55:20 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2016-06-21 21:55:34 +0200 |
commit | 8ef57a0d6154119e1a616dd8c29e8c32e35808a0 (patch) | |
tree | 26c51bc5d99260b44ba3a2585091ca764559f939 /libswscale/x86 | |
parent | 373b82066cd4d0c7f42af9b03e8cdc1085e1a6e5 (diff) | |
parent | 41ed7ab45fc693f7d7fc35664c0233f4c32d69bb (diff) | |
download | ffmpeg-streaming-8ef57a0d6154119e1a616dd8c29e8c32e35808a0.zip ffmpeg-streaming-8ef57a0d6154119e1a616dd8c29e8c32e35808a0.tar.gz |
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libswscale/x86')
-rw-r--r-- | libswscale/x86/output.asm | 8 | ||||
-rw-r--r-- | libswscale/x86/scale.asm | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm index 133817c..db3e993 100644 --- a/libswscale/x86/output.asm +++ b/libswscale/x86/output.asm @@ -50,17 +50,17 @@ SECTION .text ; const uint8_t *dither, int offset) ; ; Scale one or $filterSize lines of source data to generate one line of output -; data. The input is 15-bit in int16_t if $output_size is [8,10] and 19-bit in -; int32_t if $output_size is 16. $filter is 12-bits. $filterSize is a multiple +; data. The input is 15 bits in int16_t if $output_size is [8,10] and 19 bits in +; int32_t if $output_size is 16. $filter is 12 bits. $filterSize is a multiple ; of 2. $offset is either 0 or 3. $dither holds 8 values. ;----------------------------------------------------------------------------- %macro yuv2planeX_mainloop 2 .pixelloop_%2: %assign %%i 0 - ; the rep here is for the 8bit output mmx case, where dither covers + ; the rep here is for the 8-bit output MMX case, where dither covers ; 8 pixels but we can only handle 2 pixels per register, and thus 4 ; pixels per iteration. In order to not have to keep track of where - ; we are w.r.t. dithering, we unroll the mmx/8bit loop x2. + ; we are w.r.t. dithering, we unroll the MMX/8-bit loop x2. %if %1 == 8 %assign %%repcnt 16/mmsize %else diff --git a/libswscale/x86/scale.asm b/libswscale/x86/scale.asm index 7af92f7..f978170 100644 --- a/libswscale/x86/scale.asm +++ b/libswscale/x86/scale.asm @@ -39,10 +39,10 @@ SECTION .text ; const int16_t *filter, ; const int32_t *filterPos, int filterSize); ; -; Scale one horizontal line. Input is either 8-bits width or 16-bits width +; Scale one horizontal line. Input is either 8-bit width or 16-bit width ; ($source_width can be either 8, 9, 10 or 16, difference is whether we have to -; downscale before multiplying). Filter is 14-bits. Output is either 15bits -; (in int16_t) or 19bits (in int32_t), as given in $intermediate_nbits. Each +; downscale before multiplying). Filter is 14 bits. Output is either 15 bits +; (in int16_t) or 19 bits (in int32_t), as given in $intermediate_nbits. Each ; output pixel is generated from $filterSize input pixels, the position of ; the first pixel is given in filterPos[nOutputPixel]. ;----------------------------------------------------------------------------- |