Mercurial > libavcodec.hg
changeset 11378:f46b68960464 libavcodec
Move some VC1 dsp prototypes to dsputil.h; they are defined in dsputil.c
Also fix function definitions to match prototypes (missing const).
| author | mru |
|---|---|
| date | Sat, 06 Mar 2010 22:36:55 +0000 |
| parents | f9e0f62a7d8a |
| children | 4b0cc1b97def |
| files | dsputil.c dsputil.h vc1dsp.c |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/dsputil.c Sat Mar 06 22:36:52 2010 +0000 +++ b/dsputil.c Sat Mar 06 22:36:55 2010 +0000 @@ -2811,10 +2811,10 @@ #if CONFIG_VC1_DECODER /* 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); } -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); } #endif /* CONFIG_VC1_DECODER */
--- a/dsputil.h Sat Mar 06 22:36:52 2010 +0000 +++ b/dsputil.h Sat Mar 06 22:36:55 2010 +0000 @@ -96,6 +96,10 @@ void ff_vp6_filter_diag4_c(uint8_t *dst, uint8_t *src, int stride, 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 */ 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);
--- a/vc1dsp.c Sat Mar 06 22:36:52 2010 +0000 +++ b/vc1dsp.c Sat Mar 06 22:36:55 2010 +0000 @@ -581,10 +581,6 @@ /* 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)\ 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); \