virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/huffyuvdsp: Change w to intptr in add_hfyu_median_pred() and add_hfyu_left_pred()

Browse Source 
This avoids potential issues with the high 32bits being random in x86-64 asm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-30 15:07:36 +02:00
parent 884078d2df
commit 7be79c76d3
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/huffyuvdsp.c
View File

@@ -41,7 +41,7 @@ static void add_bytes_c(uint8_t *dst, uint8_t *src, intptr_t w)
} }
static void add_hfyu_median_pred_c(uint8_t *dst, const uint8_t *src1, static void add_hfyu_median_pred_c(uint8_t *dst, const uint8_t *src1,
const uint8_t *diff, int w, const uint8_t *diff, intptr_t w,
int *left, int *left_top) int *left, int *left_top)
{ {
int i; int i;
@@ -60,7 +60,7 @@ static void add_hfyu_median_pred_c(uint8_t *dst, const uint8_t *src1,
*left_top = lt; *left_top = lt;
} }
static int add_hfyu_left_pred_c(uint8_t *dst, const uint8_t *src, int w, static int add_hfyu_left_pred_c(uint8_t *dst, const uint8_t *src, intptr_t w,
int acc) int acc)
{ {
int i; int i;

4
libavcodec/huffyuvdsp.h
View File

@@ -37,10 +37,10 @@ typedef struct HuffYUVDSPContext {
void (*add_bytes)(uint8_t *dst /* align 16 */, uint8_t *src /* align 16 */, void (*add_bytes)(uint8_t *dst /* align 16 */, uint8_t *src /* align 16 */,
intptr_t w); intptr_t w);
void (*add_hfyu_median_pred)(uint8_t *dst, const uint8_t *top, void (*add_hfyu_median_pred)(uint8_t *dst, const uint8_t *top,
const uint8_t *diff, int w, const uint8_t *diff, intptr_t w,
int *left, int *left_top); int *left, int *left_top);
int (*add_hfyu_left_pred)(uint8_t *dst, const uint8_t *src, int (*add_hfyu_left_pred)(uint8_t *dst, const uint8_t *src,
int w, int left); intptr_t w, int left);
void (*add_hfyu_left_pred_bgr32)(uint8_t *dst, const uint8_t *src, void (*add_hfyu_left_pred_bgr32)(uint8_t *dst, const uint8_t *src,
intptr_t w, uint8_t *left); intptr_t w, uint8_t *left);
} HuffYUVDSPContext; } HuffYUVDSPContext;

10
libavcodec/x86/huffyuvdsp_init.c
View File

@@ -27,19 +27,19 @@ void ff_add_bytes_mmx(uint8_t *dst, uint8_t *src, intptr_t w);
void ff_add_bytes_sse2(uint8_t *dst, uint8_t *src, intptr_t w); void ff_add_bytes_sse2(uint8_t *dst, uint8_t *src, intptr_t w);
void ff_add_hfyu_median_pred_cmov(uint8_t *dst, const uint8_t *top, void ff_add_hfyu_median_pred_cmov(uint8_t *dst, const uint8_t *top,
const uint8_t *diff, int w, const uint8_t *diff, intptr_t w,
int *left, int *left_top); int *left, int *left_top);
void ff_add_hfyu_median_pred_mmxext(uint8_t *dst, const uint8_t *top, void ff_add_hfyu_median_pred_mmxext(uint8_t *dst, const uint8_t *top,
const uint8_t *diff, int w, const uint8_t *diff, intptr_t w,
int *left, int *left_top); int *left, int *left_top);
void ff_add_hfyu_median_pred_sse2(uint8_t *dst, const uint8_t *top, void ff_add_hfyu_median_pred_sse2(uint8_t *dst, const uint8_t *top,
const uint8_t *diff, int w, const uint8_t *diff, intptr_t w,
int *left, int *left_top); int *left, int *left_top);
int ff_add_hfyu_left_pred_ssse3(uint8_t *dst, const uint8_t *src, int ff_add_hfyu_left_pred_ssse3(uint8_t *dst, const uint8_t *src,
int w, int left); intptr_t w, int left);
int ff_add_hfyu_left_pred_sse4(uint8_t *dst, const uint8_t *src, int ff_add_hfyu_left_pred_sse4(uint8_t *dst, const uint8_t *src,
int w, int left); intptr_t w, int left);
av_cold void ff_huffyuvdsp_init_x86(HuffYUVDSPContext *c) av_cold void ff_huffyuvdsp_init_x86(HuffYUVDSPContext *c)
{ {