From a520d8fd35800fb5b0b7d338740984c2a16bc909 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 3 May 2014 22:49:21 +0200 Subject: avcodec/snow_dwt: fix "incompatible pointer type" warnings Signed-off-by: Michael Niedermayer --- libavcodec/snow_dwt.c | 14 +++++++------- libavcodec/snow_dwt.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/snow_dwt.c b/libavcodec/snow_dwt.c index ed8284cdb5..cd94c13309 100644 --- a/libavcodec/snow_dwt.c +++ b/libavcodec/snow_dwt.c @@ -745,7 +745,7 @@ void ff_spatial_idwt(IDWTELEM *buffer, IDWTELEM *temp, int width, int height, 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 s, i, j; @@ -814,32 +814,32 @@ static inline int w_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, 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); } -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); } -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); } -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); } -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); } -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); } diff --git a/libavcodec/snow_dwt.h b/libavcodec/snow_dwt.h index 0806b389e2..e929189672 100644 --- a/libavcodec/snow_dwt.h +++ b/libavcodec/snow_dwt.h @@ -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 add, uint8_t *dst8); -int ff_w53_32_c(void *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_w53_32_c(struct MpegEncContext *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, int type, int decomposition_count); -- cgit v1.2.3