diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-06 22:36:55 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-06 22:36:55 +0000 |
| commit | 4f602a041522c7fc809dcc5192489cc9febb19e7 (patch) | |
| tree | fe6c93d6490ade3902dab58225aed088a880f3a6 | |
| parent | bb174ff1f963052af3c292145e4b301f7145256e (diff) | |
| download | ffmpeg-4f602a041522c7fc809dcc5192489cc9febb19e7.tar.gz | |
Move some VC1 dsp prototypes to dsputil.h; they are defined in dsputil.c
Also fix function definitions to match prototypes (missing const).
Originally committed as revision 22263 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/dsputil.c | 4 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 4 | ||||
| -rw-r--r-- | libavcodec/vc1dsp.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 3e2237351d..f81f376cdc 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2811,10 +2811,10 @@ void ff_avg_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride) { #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 */ diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index a3ff0693e5..93a3a2f9ef 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -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, 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); diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c index 85896dbdde..31c976d6c0 100644 --- a/libavcodec/vc1dsp.c +++ b/libavcodec/vc1dsp.c @@ -581,10 +581,6 @@ VC1_MSPEL_MC(op_avg, avg_) /* 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); \ |