Also fix function definitions to match prototypes (missing const). Originally committed as revision 22263 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.6
@@ -2811,10 +2811,10 @@ void ff_avg_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride) { | |||||
#if CONFIG_VC1_DECODER | #if CONFIG_VC1_DECODER | ||||
/* VC-1 specific */ | /* VC-1 specific */ | ||||
void ff_put_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) { | |||||
void ff_put_vc1_mspel_mc00_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { | |||||
put_pixels8_c(dst, src, stride, 8); | put_pixels8_c(dst, src, stride, 8); | ||||
} | } | ||||
void ff_avg_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) { | |||||
void ff_avg_vc1_mspel_mc00_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { | |||||
avg_pixels8_c(dst, src, stride, 8); | avg_pixels8_c(dst, src, stride, 8); | ||||
} | } | ||||
#endif /* CONFIG_VC1_DECODER */ | #endif /* CONFIG_VC1_DECODER */ | ||||
@@ -96,6 +96,10 @@ void ff_vp3_h_loop_filter_c(uint8_t *src, int stride, int *bounding_values); | |||||
void ff_vp6_filter_diag4_c(uint8_t *dst, uint8_t *src, int stride, | void ff_vp6_filter_diag4_c(uint8_t *dst, uint8_t *src, int stride, | ||||
const int16_t *h_weights, const int16_t *v_weights); | const int16_t *h_weights, const int16_t *v_weights); | ||||
/* VC1 functions */ | |||||
void ff_put_vc1_mspel_mc00_c(uint8_t *dst, const uint8_t *src, int stride, int rnd); | |||||
void ff_avg_vc1_mspel_mc00_c(uint8_t *dst, const uint8_t *src, int stride, int rnd); | |||||
/* 1/2^n downscaling functions from imgconvert.c */ | /* 1/2^n downscaling functions from imgconvert.c */ | ||||
void ff_img_copy_plane(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); | void ff_img_copy_plane(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); | ||||
void ff_shrink22(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); | void ff_shrink22(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); | ||||
@@ -581,10 +581,6 @@ VC1_MSPEL_MC(op_avg, avg_) | |||||
/* pixel functions - really are entry points to vc1_mspel_mc */ | /* pixel functions - really are entry points to vc1_mspel_mc */ | ||||
/* this one is defined in dsputil.c */ | |||||
void ff_put_vc1_mspel_mc00_c(uint8_t *dst, const uint8_t *src, int stride, int rnd); | |||||
void ff_avg_vc1_mspel_mc00_c(uint8_t *dst, const uint8_t *src, int stride, int rnd); | |||||
#define PUT_VC1_MSPEL(a, b)\ | #define PUT_VC1_MSPEL(a, b)\ | ||||
static void put_vc1_mspel_mc ## a ## b ##_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { \ | static void put_vc1_mspel_mc ## a ## b ##_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { \ | ||||
put_vc1_mspel_mc(dst, src, stride, a, b, rnd); \ | put_vc1_mspel_mc(dst, src, stride, a, b, rnd); \ | ||||