diff options
author | Clément Bœsch <u@pkh.me> | 2017-03-20 13:47:29 +0100 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-03-20 15:58:32 +0100 |
commit | e07fa3008bcafc027e9aa654657bae1f1ac64f5d (patch) | |
tree | fdc9dc3b4e4565b2a7b4a27a0ccbe77ab65e22b0 /libavcodec/x86/pixblockdsp.asm | |
parent | ce818d90bdb28d8591e6b81e020d1e7f87536649 (diff) | |
parent | de452e503734ebb0fdbce86e9d16693b3530fad3 (diff) | |
download | ffmpeg-e07fa3008bcafc027e9aa654657bae1f1ac64f5d.tar.gz |
Merge commit 'de452e503734ebb0fdbce86e9d16693b3530fad3'
* commit 'de452e503734ebb0fdbce86e9d16693b3530fad3':
pixblockdsp: Change type of stride parameters to ptrdiff_t
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/x86/pixblockdsp.asm')
-rw-r--r-- | libavcodec/x86/pixblockdsp.asm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/x86/pixblockdsp.asm b/libavcodec/x86/pixblockdsp.asm index 2864d0c977..440fe29bcc 100644 --- a/libavcodec/x86/pixblockdsp.asm +++ b/libavcodec/x86/pixblockdsp.asm @@ -26,7 +26,7 @@ SECTION .text INIT_MMX mmx -; void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size) +; void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, ptrdiff_t stride) cglobal get_pixels, 3,4 add r0, 128 mov r3, -128 @@ -81,10 +81,9 @@ cglobal get_pixels, 3, 4, 5 RET ; void ff_diff_pixels_mmx(int16_t *block, const uint8_t *s1, const uint8_t *s2, -; int stride); +; ptrdiff_t stride); %macro DIFF_PIXELS 0 cglobal diff_pixels, 4,5,5 - movsxdifnidn r3, r3d pxor m4, m4 add r0, 128 mov r4, -128 |