diff options
| -rw-r--r-- | libavcodec/dsputil.c | 14 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 8 | ||||
| -rw-r--r-- | libavcodec/mlpdsp.c | 2 |
3 files changed, 8 insertions, 16 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 9709d4aab0..3e2237351d 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2795,8 +2795,6 @@ static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int #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 @@ void ff_avg_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride) { } #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 @@ void ff_avg_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) { } #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 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){ 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 --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 9ab647608a..a3ff0693e5 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -663,6 +663,14 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx); 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 --git a/libavcodec/mlpdsp.c b/libavcodec/mlpdsp.c index 79059d925a..a0647eee69 100644 --- a/libavcodec/mlpdsp.c +++ b/libavcodec/mlpdsp.c @@ -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) { c->mlp_filter_channel = ff_mlp_filter_channel; |