Commit a520d8fd authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/snow_dwt: fix "incompatible pointer type" warnings

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 5918c5a4
...@@ -745,7 +745,7 @@ void ff_spatial_idwt(IDWTELEM *buffer, IDWTELEM *temp, int width, int height, ...@@ -745,7 +745,7 @@ void ff_spatial_idwt(IDWTELEM *buffer, IDWTELEM *temp, int width, int height,
decomposition_count, y); decomposition_count, y);
} }
static inline int w_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, static inline int w_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, int line_size,
int w, int h, int type) int w, int h, int type)
{ {
int s, i, j; int s, i, j;
...@@ -814,32 +814,32 @@ static inline int w_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, ...@@ -814,32 +814,32 @@ static inline int w_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size,
return s >> 9; return s >> 9;
} }
static int w53_8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) static int w53_8_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
{ {
return w_c(v, pix1, pix2, line_size, 8, h, 1); return w_c(v, pix1, pix2, line_size, 8, h, 1);
} }
static int w97_8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) static int w97_8_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
{ {
return w_c(v, pix1, pix2, line_size, 8, h, 0); return w_c(v, pix1, pix2, line_size, 8, h, 0);
} }
static int w53_16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) static int w53_16_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
{ {
return w_c(v, pix1, pix2, line_size, 16, h, 1); return w_c(v, pix1, pix2, line_size, 16, h, 1);
} }
static int w97_16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) static int w97_16_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
{ {
return w_c(v, pix1, pix2, line_size, 16, h, 0); return w_c(v, pix1, pix2, line_size, 16, h, 0);
} }
int ff_w53_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) int ff_w53_32_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
{ {
return w_c(v, pix1, pix2, line_size, 32, h, 1); return w_c(v, pix1, pix2, line_size, 32, h, 1);
} }
int ff_w97_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) int ff_w97_32_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
{ {
return w_c(v, pix1, pix2, line_size, 32, h, 0); return w_c(v, pix1, pix2, line_size, 32, h, 0);
} }
......
...@@ -105,8 +105,8 @@ void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, ...@@ -105,8 +105,8 @@ void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride,
int src_y, int src_stride, slice_buffer *sb, int src_y, int src_stride, slice_buffer *sb,
int add, uint8_t *dst8); int add, uint8_t *dst8);
int ff_w53_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h); int ff_w53_32_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
int ff_w97_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h); int ff_w97_32_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
void ff_spatial_dwt(int *buffer, int *temp, int width, int height, int stride, void ff_spatial_dwt(int *buffer, int *temp, int width, int height, int stride,
int type, int decomposition_count); int type, int decomposition_count);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment