diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-06 15:43:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-06 15:50:54 +0200 |
| commit | 305f72aee77bc36d1da9feaec42f9ddcdc9b0689 (patch) | |
| tree | 27518b8c975f62d9a102837f29c1c8ab67d3ef03 /libavcodec/x86 | |
| parent | 6b1df5544e8df9ad95512c638df2580856389fae (diff) | |
| download | ffmpeg-305f72aee77bc36d1da9feaec42f9ddcdc9b0689.tar.gz | |
avcodec: Change get_pixels() to ptrdiff_t linesize
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/pixblockdsp.asm | 4 | ||||
| -rw-r--r-- | libavcodec/x86/pixblockdsp_init.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/x86/pixblockdsp.asm b/libavcodec/x86/pixblockdsp.asm index 00ee9b4ac2..7c5377b2bb 100644 --- a/libavcodec/x86/pixblockdsp.asm +++ b/libavcodec/x86/pixblockdsp.asm @@ -26,9 +26,8 @@ SECTION .text INIT_MMX mmx -; void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, int line_size) +; void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size) cglobal get_pixels, 3,4 - movsxdifnidn r2, r2d add r0, 128 mov r3, -128 pxor m7, m7 @@ -52,7 +51,6 @@ cglobal get_pixels, 3,4 INIT_XMM sse2 cglobal get_pixels, 3, 4, 5 - movsxdifnidn r2, r2d lea r3, [r2*3] pxor m4, m4 movh m0, [r1] diff --git a/libavcodec/x86/pixblockdsp_init.c b/libavcodec/x86/pixblockdsp_init.c index 4c31b802ff..4d06a44c6d 100644 --- a/libavcodec/x86/pixblockdsp_init.c +++ b/libavcodec/x86/pixblockdsp_init.c @@ -23,8 +23,8 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/pixblockdsp.h" -void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, int line_size); -void ff_get_pixels_sse2(int16_t *block, const uint8_t *pixels, int line_size); +void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size); +void ff_get_pixels_sse2(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size); void ff_diff_pixels_mmx(int16_t *block, const uint8_t *s1, const uint8_t *s2, int stride); void ff_diff_pixels_sse2(int16_t *block, const uint8_t *s1, const uint8_t *s2, |