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

huffyuvencdsp: Use intptr_t for width

Browse Source 
It is done this way in huffyuvdsp as well.
This commit is contained in:
Timothy Gu
2015-10-19 02:12:28 +01:00
parent a079cbf458
commit 068e6cb732
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/huffyuvencdsp.c
View File

@@ -25,7 +25,7 @@
#define pb_7f (~0UL / 255 * 0x7f) #define pb_7f (~0UL / 255 * 0x7f)
#define pb_80 (~0UL / 255 * 0x80) #define pb_80 (~0UL / 255 * 0x80)
static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int w) static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, intptr_t w)
{ {
long i; long i;
@@ -54,7 +54,7 @@ static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2,
} }
static void sub_hfyu_median_pred_c(uint8_t *dst, const uint8_t *src1, static void sub_hfyu_median_pred_c(uint8_t *dst, const uint8_t *src1,
const uint8_t *src2, int w, const uint8_t *src2, intptr_t w,
int *left, int *left_top) int *left, int *left_top)
{ {
int i; int i;

4
libavcodec/huffyuvencdsp.h
View File

@@ -25,13 +25,13 @@ typedef struct HuffYUVEncDSPContext {
void (*diff_bytes)(uint8_t *dst /* align 16 */, void (*diff_bytes)(uint8_t *dst /* align 16 */,
const uint8_t *src1 /* align 16 */, const uint8_t *src1 /* align 16 */,
const uint8_t *src2 /* align 1 */, const uint8_t *src2 /* align 1 */,
int w); intptr_t w);
/** /**
* Subtract HuffYUV's variant of median prediction. * Subtract HuffYUV's variant of median prediction.
* Note, this might read from src1[-1], src2[-1]. * Note, this might read from src1[-1], src2[-1].
*/ */
void (*sub_hfyu_median_pred)(uint8_t *dst, const uint8_t *src1, void (*sub_hfyu_median_pred)(uint8_t *dst, const uint8_t *src1,
const uint8_t *src2, int w, const uint8_t *src2, intptr_t w,
int *left, int *left_top); int *left, int *left_top);
} HuffYUVEncDSPContext; } HuffYUVEncDSPContext;

5
libavcodec/x86/huffyuvencdsp_mmx.c
View File

@@ -31,7 +31,8 @@
#if HAVE_INLINE_ASM #if HAVE_INLINE_ASM
static void diff_bytes_mmx(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int w) static void diff_bytes_mmx(uint8_t *dst, const uint8_t *src1, const uint8_t *src2,
intptr_t w)
{ {
x86_reg i = 0; x86_reg i = 0;
@@ -57,7 +58,7 @@ static void diff_bytes_mmx(uint8_t *dst, const uint8_t *src1, const uint8_t *src
} }
static void sub_hfyu_median_pred_mmxext(uint8_t *dst, const uint8_t *src1, static void sub_hfyu_median_pred_mmxext(uint8_t *dst, const uint8_t *src1,
const uint8_t *src2, int w, const uint8_t *src2, intptr_t w,
int *left, int *left_top) int *left, int *left_top)
{ {
x86_reg i = 0; x86_reg i = 0;