dnxhdenc: make get_pixel_8x4_sym accept ptrdiff_t as stride
authorTimothy Gu <timothygu99@gmail.com>
Thu, 27 Mar 2014 02:06:29 +0000 (19:06 -0700)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 22:09:10 +0000 (23:09 +0100)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dnxhdenc.c
libavcodec/dnxhdenc.h
libavcodec/x86/dnxhdenc.c

index fb37a9d..4fda9ee 100644 (file)
@@ -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;
index 110b0ad..52083be 100644 (file)
@@ -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);
index c7e776a..b4d9f02 100644 (file)
@@ -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"