Browse Source

huffyuvencdsp: Use intptr_t for width

It is done this way in huffyuvdsp as well.
tags/n3.0
Timothy Gu 9 years ago
parent
commit
068e6cb732
3 changed files with 7 additions and 6 deletions
  1. +2
    -2
      libavcodec/huffyuvencdsp.c
  2. +2
    -2
      libavcodec/huffyuvencdsp.h
  3. +3
    -2
      libavcodec/x86/huffyuvencdsp_mmx.c

+ 2
- 2
libavcodec/huffyuvencdsp.c View File

@@ -25,7 +25,7 @@
#define pb_7f (~0UL / 255 * 0x7f)
#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;

@@ -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,
const uint8_t *src2, int w,
const uint8_t *src2, intptr_t w,
int *left, int *left_top)
{
int i;


+ 2
- 2
libavcodec/huffyuvencdsp.h View File

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



+ 3
- 2
libavcodec/x86/huffyuvencdsp_mmx.c View File

@@ -31,7 +31,8 @@

#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;

@@ -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,
const uint8_t *src2, int w,
const uint8_t *src2, intptr_t w,
int *left, int *left_top)
{
x86_reg i = 0;


Loading…
Cancel
Save