diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-04-11 01:17:12 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-04-12 09:30:12 +0200 |
| commit | a89c05500f68d94a0269e68bc522abfd420c5497 (patch) | |
| tree | d54ad4eeb7e2b78c712d2b517e05eba390a07193 | |
| parent | 25882a7ff642e83f606071a568214c210b7b7ff1 (diff) | |
| download | ffmpeg-a89c05500f68d94a0269e68bc522abfd420c5497.tar.gz | |
x86: h264qpel: int --> ptrdiff_t for some line_size parameters
| -rw-r--r-- | libavcodec/x86/h264_qpel.c | 13 | ||||
| -rw-r--r-- | libavcodec/x86/qpel.asm | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index f909825944..2d1c443254 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -28,17 +28,20 @@ #include "dsputil_mmx.h" #if HAVE_YASM -void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h); -void ff_avg_pixels4_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h); -void ff_put_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h); +void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_avg_pixels4_mmxext(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_put_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); static void ff_put_pixels16_mmxext(uint8_t *block, const uint8_t *pixels, - int line_size, int h) + ptrdiff_t line_size, int h) { ff_put_pixels8_mmxext(block, pixels, line_size, h); ff_put_pixels8_mmxext(block + 8, pixels + 8, line_size, h); } static void ff_avg_pixels16_mmxext(uint8_t *block, const uint8_t *pixels, - int line_size, int h) + ptrdiff_t line_size, int h) { ff_avg_pixels8_mmxext(block, pixels, line_size, h); ff_avg_pixels8_mmxext(block + 8, pixels + 8, line_size, h); diff --git a/libavcodec/x86/qpel.asm b/libavcodec/x86/qpel.asm index ba97e2aec8..583f0d2791 100644 --- a/libavcodec/x86/qpel.asm +++ b/libavcodec/x86/qpel.asm @@ -176,7 +176,7 @@ PIXELS16_L2 put PIXELS16_L2 avg INIT_MMX mmxext -; void pixels(uint8_t *block, const uint8_t *pixels, int line_size, int h) +; void pixels(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) %macro PIXELS48 2 %if %2 == 4 %define OP movh |