diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 22:21:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 22:22:27 +0200 |
| commit | 52bda1d903954c353bdd718a034675ee78977561 (patch) | |
| tree | 12e7a6314e21489e8c91901e31dc08b4efa6a82c /libavcodec/x86/h264_qpel.c | |
| parent | a47288f6dc4bb8d446d43d0218444ca45b3c150e (diff) | |
| parent | a89c05500f68d94a0269e68bc522abfd420c5497 (diff) | |
Merge commit 'a89c05500f68d94a0269e68bc522abfd420c5497'
* commit 'a89c05500f68d94a0269e68bc522abfd420c5497':
x86: h264qpel: int --> ptrdiff_t for some line_size parameters
Conflicts:
libavcodec/x86/qpelbase.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_qpel.c')
| -rw-r--r-- | libavcodec/x86/h264_qpel.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index 1e1ee4ecaa..4c37ee5472 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); |