Move prototypes for various dsputil init functions to dsputil.h

Originally committed as revision 22261 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-03-06 22:36:49 +00:00
parent 3da1180409
commit 7de9da9ba7
3 changed files with 8 additions and 16 deletions

View File

@ -2795,8 +2795,6 @@ static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int
#if CONFIG_CAVS_DECODER #if CONFIG_CAVS_DECODER
/* AVS specific */ /* 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) { void ff_put_cavs_qpel8_mc00_c(uint8_t *dst, uint8_t *src, int stride) {
put_pixels8_c(dst, src, stride, 8); put_pixels8_c(dst, src, stride, 8);
} }
@ -2811,12 +2809,8 @@ void ff_avg_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride) {
} }
#endif /* CONFIG_CAVS_DECODER */ #endif /* CONFIG_CAVS_DECODER */
void ff_mlp_init(DSPContext* c, AVCodecContext *avctx);
#if CONFIG_VC1_DECODER #if CONFIG_VC1_DECODER
/* VC-1 specific */ /* 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) { void ff_put_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) {
put_pixels8_c(dst, src, stride, 8); put_pixels8_c(dst, src, stride, 8);
} }
@ -2825,15 +2819,9 @@ void ff_avg_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) {
} }
#endif /* CONFIG_VC1_DECODER */ #endif /* CONFIG_VC1_DECODER */
void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx);
/* H264 specific */ /* H264 specific */
void ff_h264dspenc_init(DSPContext* c, AVCodecContext *avctx); 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 #if CONFIG_RV40_DECODER
static void put_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, int stride){ static void put_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, int stride){
put_pixels16_xy2_c(dst, src, stride, 16); put_pixels16_xy2_c(dst, src, stride, 16);
@ -2847,8 +2835,6 @@ static void put_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, int stride){
static void avg_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, int stride){ static void avg_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, int stride){
avg_pixels8_xy2_c(dst, src, stride, 8); avg_pixels8_xy2_c(dst, src, stride, 8);
} }
void ff_rv40dsp_init(DSPContext* c, AVCodecContext *avctx);
#endif /* CONFIG_RV40_DECODER */ #endif /* CONFIG_RV40_DECODER */
static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int w){ static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int w){

View File

@ -663,6 +663,14 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx);
void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx); void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx);
void dsputil_init_vis(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 #if HAVE_MMX
#undef emms_c #undef emms_c

View File

@ -55,8 +55,6 @@ static void ff_mlp_filter_channel(int32_t *state, const int32_t *coeff,
} }
} }
void ff_mlp_init_x86(DSPContext* c, AVCodecContext *avctx);
void ff_mlp_init(DSPContext* c, AVCodecContext *avctx) void ff_mlp_init(DSPContext* c, AVCodecContext *avctx)
{ {
c->mlp_filter_channel = ff_mlp_filter_channel; c->mlp_filter_channel = ff_mlp_filter_channel;