# HG changeset patch # User mru # Date 1267915009 0 # Node ID 0b220468ba0d7afaaa8dbbda08a14991c6ec3cac # Parent 84963c795459a866075b3c1a6a006110837bb1f0 Move prototypes for various dsputil init functions to dsputil.h diff -r 84963c795459 -r 0b220468ba0d dsputil.c --- a/dsputil.c Sat Mar 06 22:36:45 2010 +0000 +++ b/dsputil.c Sat Mar 06 22:36:49 2010 +0000 @@ -2795,8 +2795,6 @@ #if CONFIG_CAVS_DECODER /* AVS specific */ -void ff_cavsdsp_init(DSPContext* c, AVCodecContext *avctx); - void ff_put_cavs_qpel8_mc00_c(uint8_t *dst, uint8_t *src, int stride) { put_pixels8_c(dst, src, stride, 8); } @@ -2811,12 +2809,8 @@ } #endif /* CONFIG_CAVS_DECODER */ -void ff_mlp_init(DSPContext* c, AVCodecContext *avctx); - #if CONFIG_VC1_DECODER /* VC-1 specific */ -void ff_vc1dsp_init(DSPContext* c, AVCodecContext *avctx); - void ff_put_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) { put_pixels8_c(dst, src, stride, 8); } @@ -2825,15 +2819,9 @@ } #endif /* CONFIG_VC1_DECODER */ -void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx); - /* H264 specific */ void ff_h264dspenc_init(DSPContext* c, AVCodecContext *avctx); -#if CONFIG_RV30_DECODER -void ff_rv30dsp_init(DSPContext* c, AVCodecContext *avctx); -#endif /* CONFIG_RV30_DECODER */ - #if CONFIG_RV40_DECODER static void put_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, int stride){ put_pixels16_xy2_c(dst, src, stride, 16); @@ -2847,8 +2835,6 @@ static void avg_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, int stride){ avg_pixels8_xy2_c(dst, src, stride, 8); } - -void ff_rv40dsp_init(DSPContext* c, AVCodecContext *avctx); #endif /* CONFIG_RV40_DECODER */ static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int w){ diff -r 84963c795459 -r 0b220468ba0d dsputil.h --- a/dsputil.h Sat Mar 06 22:36:45 2010 +0000 +++ b/dsputil.h Sat Mar 06 22:36:49 2010 +0000 @@ -663,6 +663,14 @@ void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx); void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx); +void ff_cavsdsp_init(DSPContext* c, AVCodecContext *avctx); +void ff_rv30dsp_init(DSPContext* c, AVCodecContext *avctx); +void ff_rv40dsp_init(DSPContext* c, AVCodecContext *avctx); +void ff_vc1dsp_init(DSPContext* c, AVCodecContext *avctx); +void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx); +void ff_mlp_init(DSPContext* c, AVCodecContext *avctx); +void ff_mlp_init_x86(DSPContext* c, AVCodecContext *avctx); + #if HAVE_MMX #undef emms_c diff -r 84963c795459 -r 0b220468ba0d mlpdsp.c --- a/mlpdsp.c Sat Mar 06 22:36:45 2010 +0000 +++ b/mlpdsp.c Sat Mar 06 22:36:49 2010 +0000 @@ -55,8 +55,6 @@ } } -void ff_mlp_init_x86(DSPContext* c, AVCodecContext *avctx); - void ff_mlp_init(DSPContext* c, AVCodecContext *avctx) { c->mlp_filter_channel = ff_mlp_filter_channel;