diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-19 12:32:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-19 12:32:12 +0100 |
| commit | cf10616cc0db272bab9206a2f0f921f965e379da (patch) | |
| tree | 0e07c43b424aa57a4af008c332ac3aca7a75e90a /libavcodec | |
| parent | 4e469842b5254dda261223a23e53c5a0f539544d (diff) | |
| parent | 7a03145ed7cb4f1ce794b5126559dd6f38029243 (diff) | |
| download | ffmpeg-cf10616cc0db272bab9206a2f0f921f965e379da.tar.gz | |
Merge commit '7a03145ed7cb4f1ce794b5126559dd6f38029243'
* commit '7a03145ed7cb4f1ce794b5126559dd6f38029243':
x86: dsputil: int --> ptrdiff_t for ff_put_pixels16_mmxext line_size param
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 98a6d5793d..2f7f50e3ed 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -149,7 +149,7 @@ void ff_avg_pixels8_xy2_3dnow(uint8_t *block, const uint8_t *pixels, 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); |