diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-03-28 02:32:09 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-04-11 12:09:09 +0200 |
| commit | 676856204b84dfaffe329dce8502e834a0dbdb19 (patch) | |
| tree | b9997222c9ee1418c8d28a32767c581d4ce86f2a | |
| parent | 89ef08c992c484a46711b1a68a988303679c288e (diff) | |
| download | ffmpeg-676856204b84dfaffe329dce8502e834a0dbdb19.tar.gz | |
DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride
| -rw-r--r-- | libavcodec/dnxhdenc.c | 4 | ||||
| -rw-r--r-- | libavcodec/dnxhdenc.h | 3 | ||||
| -rw-r--r-- | libavcodec/x86/dnxhdenc.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 92e69daa95..4b06f6cc03 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -55,7 +55,7 @@ static const AVClass class = { static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *restrict block, const uint8_t *pixels, - int line_size) + ptrdiff_t line_size) { int i; for (i = 0; i < 4; i++) { @@ -79,7 +79,7 @@ static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *restrict block, static av_always_inline void dnxhd_10bit_get_pixels_8x4_sym(int16_t *restrict block, const uint8_t *pixels, - int line_size) + ptrdiff_t line_size) { int i; diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h index 232e3348d3..215482ed5e 100644 --- a/libavcodec/dnxhdenc.h +++ b/libavcodec/dnxhdenc.h @@ -91,7 +91,8 @@ 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 0bab69f67d..26b715cb09 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" |