RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Timothy Gu 2014-03-26 19:06:29 -07:00 committed by Michael Niedermayer
parent 72bff8da47
commit cb11b9e89e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dnxhdenc.c
View File

@ -52,7 +52,7 @@ static const AVClass dnxhd_class = {
#define LAMBDA_FRAC_BITS 10 #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; int i;
for (i = 0; i < 4; 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); 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; int i;
const uint16_t* pixels16 = (const uint16_t*)pixels; const uint16_t* pixels16 = (const uint16_t*)pixels;

2
libavcodec/dnxhdenc.h
View File

@ -89,7 +89,7 @@ typedef struct DNXHDEncContext {
RCCMPEntry *mb_cmp; RCCMPEntry *mb_cmp;
RCEntry (*mb_rc)[8160]; 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; } DNXHDEncContext;
void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx); void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx);

2
libavcodec/x86/dnxhdenc.c
View File

@ -28,7 +28,7 @@
#if HAVE_SSE2_INLINE #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( __asm__ volatile(
"pxor %%xmm5, %%xmm5 \n\t" "pxor %%xmm5, %%xmm5 \n\t"