diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-03-26 19:06:29 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 23:09:10 +0100 |
| commit | cb11b9e89e152ed4db22e5ad0349b63fac02101e (patch) | |
| tree | 7b112316e3024a602ca62e0fa241ed3e457fe6c6 | |
| parent | 72bff8da479a0ab61444474cda266c883e7928d6 (diff) | |
dnxhdenc: make get_pixel_8x4_sym accept ptrdiff_t as stride
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dnxhdenc.c | 4 | ||||
| -rw-r--r-- | libavcodec/dnxhdenc.h | 2 | ||||
| -rw-r--r-- | libavcodec/x86/dnxhdenc.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index fb37a9d3e2..4fda9ee54c 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -52,7 +52,7 @@ static const AVClass dnxhd_class = { #define LAMBDA_FRAC_BITS 10 -static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *av_restrict block, const uint8_t *pixels, int line_size) +static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *av_restrict block, const uint8_t *pixels, ptrdiff_t line_size) { int i; for (i = 0; i < 4; i++) { @@ -69,7 +69,7 @@ static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *av_restrict block, const uint memcpy(block + 24, block - 32, sizeof(*block) * 8); } -static av_always_inline void dnxhd_10bit_get_pixels_8x4_sym(int16_t *av_restrict block, const uint8_t *pixels, int line_size) +static av_always_inline void dnxhd_10bit_get_pixels_8x4_sym(int16_t *av_restrict block, const uint8_t *pixels, ptrdiff_t line_size) { int i; const uint16_t* pixels16 = (const uint16_t*)pixels; diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h index 110b0ad9e2..52083be44b 100644 --- a/libavcodec/dnxhdenc.h +++ b/libavcodec/dnxhdenc.h @@ -89,7 +89,7 @@ typedef struct DNXHDEncContext { RCCMPEntry *mb_cmp; RCEntry (*mb_rc)[8160]; - void (*get_pixels_8x4_sym)(int16_t * /*align 16*/, const uint8_t *, int); + void (*get_pixels_8x4_sym)(int16_t * /*align 16*/, const uint8_t *, ptrdiff_t); } DNXHDEncContext; void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx); diff --git a/libavcodec/x86/dnxhdenc.c b/libavcodec/x86/dnxhdenc.c index c7e776a4c1..b4d9f02f26 100644 --- a/libavcodec/x86/dnxhdenc.c +++ b/libavcodec/x86/dnxhdenc.c @@ -28,7 +28,7 @@ #if HAVE_SSE2_INLINE -static void get_pixels_8x4_sym_sse2(int16_t *block, const uint8_t *pixels, int line_size) +static void get_pixels_8x4_sym_sse2(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size) { __asm__ volatile( "pxor %%xmm5, %%xmm5 \n\t" |