diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 15:07:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 15:12:58 +0200 |
| commit | 7be79c76d3f7711c6c7e0c6d0f3ade5632bfb591 (patch) | |
| tree | 0646f8b9758f478dd3f25dc4120728c8c18c0618 /libavcodec | |
| parent | 884078d2df0fecd769afdd916fac8727dbd7d632 (diff) | |
| download | ffmpeg-7be79c76d3f7711c6c7e0c6d0f3ade5632bfb591.tar.gz | |
avcodec/huffyuvdsp: Change w to intptr in add_hfyu_median_pred() and add_hfyu_left_pred()
This avoids potential issues with the high 32bits being random in x86-64 asm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/huffyuvdsp.c | 4 | ||||
| -rw-r--r-- | libavcodec/huffyuvdsp.h | 4 | ||||
| -rw-r--r-- | libavcodec/x86/huffyuvdsp_init.c | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/huffyuvdsp.c b/libavcodec/huffyuvdsp.c index 3d51552fc3..e8a05f6592 100644 --- a/libavcodec/huffyuvdsp.c +++ b/libavcodec/huffyuvdsp.c @@ -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, - const uint8_t *diff, int w, + const uint8_t *diff, intptr_t w, int *left, int *left_top) { int i; @@ -60,7 +60,7 @@ static void add_hfyu_median_pred_c(uint8_t *dst, const uint8_t *src1, *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 i; diff --git a/libavcodec/huffyuvdsp.h b/libavcodec/huffyuvdsp.h index c52dd69405..78b2bca135 100644 --- a/libavcodec/huffyuvdsp.h +++ b/libavcodec/huffyuvdsp.h @@ -37,10 +37,10 @@ typedef struct HuffYUVDSPContext { void (*add_bytes)(uint8_t *dst /* align 16 */, uint8_t *src /* align 16 */, intptr_t w); 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 (*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, intptr_t w, uint8_t *left); } HuffYUVDSPContext; diff --git a/libavcodec/x86/huffyuvdsp_init.c b/libavcodec/x86/huffyuvdsp_init.c index 86e482ce70..9628724090 100644 --- a/libavcodec/x86/huffyuvdsp_init.c +++ b/libavcodec/x86/huffyuvdsp_init.c @@ -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_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); 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); 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 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 w, int left); + intptr_t w, int left); av_cold void ff_huffyuvdsp_init_x86(HuffYUVDSPContext *c) { |