diff options
author | Måns Rullgård <mans@mansr.com> | 2010-03-06 22:36:59 +0000 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2010-03-06 22:36:59 +0000 |
commit | 965363f81aa7f9fd61935e9e4b766c168f243227 (patch) | |
tree | 0fbdc3d9c616d1ed120dfbd14e514a7ca0e9060a | |
parent | 4f602a041522c7fc809dcc5192489cc9febb19e7 (diff) | |
download | ffmpeg-965363f81aa7f9fd61935e9e4b766c168f243227.tar.gz |
Move some dsp func prototypes to dsputil.h; they are defined in dsputil.c
Originally committed as revision 22264 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/cavsdsp.c | 5 | ||||
-rw-r--r-- | libavcodec/dsputil.c | 8 | ||||
-rw-r--r-- | libavcodec/dsputil.h | 14 |
3 files changed, 14 insertions, 13 deletions
diff --git a/libavcodec/cavsdsp.c b/libavcodec/cavsdsp.c index 4ba08bbd2a..808f62b69f 100644 --- a/libavcodec/cavsdsp.c +++ b/libavcodec/cavsdsp.c @@ -510,11 +510,6 @@ CAVS_MC(put_, 16) CAVS_MC(avg_, 8) CAVS_MC(avg_, 16) -void ff_put_cavs_qpel8_mc00_c(uint8_t *dst, uint8_t *src, int stride); -void ff_avg_cavs_qpel8_mc00_c(uint8_t *dst, uint8_t *src, int stride); -void ff_put_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride); -void ff_avg_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride); - av_cold void ff_cavsdsp_init(DSPContext* c, AVCodecContext *avctx) { #define dspfunc(PFX, IDX, NUM) \ c->PFX ## _pixels_tab[IDX][ 0] = ff_ ## PFX ## NUM ## _mc00_c; \ diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index f81f376cdc..8513e86329 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -44,14 +44,6 @@ /* snow.c */ void ff_spatial_dwt(int *buffer, int width, int height, int stride, int type, int decomposition_count); -/* eaidct.c */ -void ff_ea_idct_put_c(uint8_t *dest, int linesize, DCTELEM *block); - -/* binkidct.c */ -void ff_bink_idct_c (DCTELEM *block); -void ff_bink_idct_add_c(uint8_t *dest, int linesize, DCTELEM *block); -void ff_bink_idct_put_c(uint8_t *dest, int linesize, DCTELEM *block); - uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP] = {0, }; uint32_t ff_squareTbl[512] = {0, }; diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 93a3a2f9ef..97c08fe5d2 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -96,10 +96,24 @@ 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); +/* Bink functions */ +void ff_bink_idct_c (DCTELEM *block); +void ff_bink_idct_add_c(uint8_t *dest, int linesize, DCTELEM *block); +void ff_bink_idct_put_c(uint8_t *dest, int linesize, DCTELEM *block); + +/* CAVS functions */ +void ff_put_cavs_qpel8_mc00_c(uint8_t *dst, uint8_t *src, int stride); +void ff_avg_cavs_qpel8_mc00_c(uint8_t *dst, uint8_t *src, int stride); +void ff_put_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride); +void ff_avg_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride); + /* 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); +/* EA functions */ +void ff_ea_idct_put_c(uint8_t *dest, int linesize, DCTELEM *block); + /* 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); |