diff options
author | Diego Biurrun <diego@biurrun.de> | 2013-01-19 02:58:47 +0400 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2013-02-06 14:30:54 +0400 |
commit | 82bd04b170de00bd867e23f329c7c83f7801572c (patch) | |
tree | edd8d09cde1d20ae77d8e69b556865b954433bae | |
parent | 79dad2a932534d1155079f937649e099f9e5cc27 (diff) |
rv34: Drop now unnecessary dsputil dependencies
-rw-r--r-- | libavcodec/arm/rv34dsp_init_arm.c | 2 | ||||
-rw-r--r-- | libavcodec/arm/rv40dsp_init_arm.c | 2 | ||||
-rw-r--r-- | libavcodec/rv30dsp.c | 5 | ||||
-rw-r--r-- | libavcodec/rv34.c | 4 | ||||
-rw-r--r-- | libavcodec/rv34dsp.c | 9 | ||||
-rw-r--r-- | libavcodec/rv34dsp.h | 14 | ||||
-rw-r--r-- | libavcodec/rv40dsp.c | 10 | ||||
-rw-r--r-- | libavcodec/x86/rv34dsp_init.c | 2 | ||||
-rw-r--r-- | libavcodec/x86/rv40dsp_init.c | 2 |
9 files changed, 26 insertions, 24 deletions
diff --git a/libavcodec/arm/rv34dsp_init_arm.c b/libavcodec/arm/rv34dsp_init_arm.c index ce86343aa5..5ce787ba7f 100644 --- a/libavcodec/arm/rv34dsp_init_arm.c +++ b/libavcodec/arm/rv34dsp_init_arm.c @@ -32,7 +32,7 @@ void ff_rv34_inv_transform_noround_dc_neon(int16_t *block); void ff_rv34_idct_add_neon(uint8_t *dst, ptrdiff_t stride, int16_t *block); void ff_rv34_idct_dc_add_neon(uint8_t *dst, ptrdiff_t stride, int dc); -av_cold void ff_rv34dsp_init_arm(RV34DSPContext *c, DSPContext *dsp) +av_cold void ff_rv34dsp_init_arm(RV34DSPContext *c) { int cpu_flags = av_get_cpu_flags(); diff --git a/libavcodec/arm/rv40dsp_init_arm.c b/libavcodec/arm/rv40dsp_init_arm.c index aaa1227088..cf51cd7f03 100644 --- a/libavcodec/arm/rv40dsp_init_arm.c +++ b/libavcodec/arm/rv40dsp_init_arm.c @@ -139,7 +139,7 @@ static av_cold void ff_rv40dsp_init_neon(RV34DSPContext *c) c->rv40_weak_loop_filter[1] = ff_rv40_v_weak_loop_filter_neon; } -av_cold void ff_rv40dsp_init_arm(RV34DSPContext *c, DSPContext *dsp) +av_cold void ff_rv40dsp_init_arm(RV34DSPContext *c) { int cpu_flags = av_get_cpu_flags(); diff --git a/libavcodec/rv30dsp.c b/libavcodec/rv30dsp.c index 394aeca347..0ae8855d18 100644 --- a/libavcodec/rv30dsp.c +++ b/libavcodec/rv30dsp.c @@ -254,11 +254,12 @@ RV30_MC(put_, 16) RV30_MC(avg_, 8) RV30_MC(avg_, 16) -av_cold void ff_rv30dsp_init(RV34DSPContext *c, DSPContext* dsp) { +av_cold void ff_rv30dsp_init(RV34DSPContext *c) +{ H264ChromaContext h264chroma; H264QpelContext qpel; - ff_rv34dsp_init(c, dsp); + ff_rv34dsp_init(c); ff_h264chroma_init(&h264chroma, 8); ff_h264qpel_init(&qpel, 8); diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 111bbb0e50..4c98e9964f 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1490,11 +1490,11 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx) #if CONFIG_RV30_DECODER if (avctx->codec_id == AV_CODEC_ID_RV30) - ff_rv30dsp_init(&r->rdsp, &r->s.dsp); + ff_rv30dsp_init(&r->rdsp); #endif #if CONFIG_RV40_DECODER if (avctx->codec_id == AV_CODEC_ID_RV40) - ff_rv40dsp_init(&r->rdsp, &r->s.dsp); + ff_rv40dsp_init(&r->rdsp); #endif if ((ret = rv34_decoder_alloc(r)) < 0) diff --git a/libavcodec/rv34dsp.c b/libavcodec/rv34dsp.c index 676e823787..7234ee808b 100644 --- a/libavcodec/rv34dsp.c +++ b/libavcodec/rv34dsp.c @@ -24,7 +24,7 @@ * @file * RV30/40 decoder common dsp functions */ -#include "dsputil.h" + #include "rv34dsp.h" #include "libavutil/common.h" @@ -128,7 +128,8 @@ static void rv34_inv_transform_dc_noround_c(int16_t *block) /** @} */ // transform -av_cold void ff_rv34dsp_init(RV34DSPContext *c, DSPContext* dsp) { +av_cold void ff_rv34dsp_init(RV34DSPContext *c) +{ c->rv34_inv_transform = rv34_inv_transform_noround_c; c->rv34_inv_transform_dc = rv34_inv_transform_dc_noround_c; @@ -136,7 +137,7 @@ av_cold void ff_rv34dsp_init(RV34DSPContext *c, DSPContext* dsp) { c->rv34_idct_dc_add = rv34_idct_dc_add_c; if (ARCH_ARM) - ff_rv34dsp_init_arm(c, dsp); + ff_rv34dsp_init_arm(c); if (ARCH_X86) - ff_rv34dsp_init_x86(c, dsp); + ff_rv34dsp_init_x86(c); } diff --git a/libavcodec/rv34dsp.h b/libavcodec/rv34dsp.h index 6d2f8345cc..c5d4e39f4f 100644 --- a/libavcodec/rv34dsp.h +++ b/libavcodec/rv34dsp.h @@ -74,14 +74,14 @@ typedef struct RV34DSPContext { rv40_loop_filter_strength_func rv40_loop_filter_strength[2]; } RV34DSPContext; -void ff_rv30dsp_init(RV34DSPContext *c, DSPContext* dsp); -void ff_rv34dsp_init(RV34DSPContext *c, DSPContext* dsp); -void ff_rv40dsp_init(RV34DSPContext *c, DSPContext* dsp); +void ff_rv30dsp_init(RV34DSPContext *c); +void ff_rv34dsp_init(RV34DSPContext *c); +void ff_rv40dsp_init(RV34DSPContext *c); -void ff_rv34dsp_init_arm(RV34DSPContext *c, DSPContext *dsp); -void ff_rv34dsp_init_x86(RV34DSPContext *c, DSPContext *dsp); +void ff_rv34dsp_init_arm(RV34DSPContext *c); +void ff_rv34dsp_init_x86(RV34DSPContext *c); -void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp); -void ff_rv40dsp_init_arm(RV34DSPContext *c, DSPContext *dsp); +void ff_rv40dsp_init_x86(RV34DSPContext *c); +void ff_rv40dsp_init_arm(RV34DSPContext *c); #endif /* AVCODEC_RV34DSP_H */ diff --git a/libavcodec/rv40dsp.c b/libavcodec/rv40dsp.c index ef723b015d..589e3c6f38 100644 --- a/libavcodec/rv40dsp.c +++ b/libavcodec/rv40dsp.c @@ -25,7 +25,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "h264qpel.h" #include "rv34dsp.h" #include "libavutil/common.h" @@ -518,10 +517,11 @@ static int rv40_v_loop_filter_strength(uint8_t *src, ptrdiff_t stride, return rv40_loop_filter_strength(src, 1, stride, beta, beta2, edge, p1, q1); } -av_cold void ff_rv40dsp_init(RV34DSPContext *c, DSPContext* dsp) { +av_cold void ff_rv40dsp_init(RV34DSPContext *c) +{ H264QpelContext qpel; - ff_rv34dsp_init(c, dsp); + ff_rv34dsp_init(c); ff_h264qpel_init(&qpel, 8); c->put_pixels_tab[0][ 0] = qpel.put_h264_qpel_pixels_tab[0][0]; @@ -607,7 +607,7 @@ av_cold void ff_rv40dsp_init(RV34DSPContext *c, DSPContext* dsp) { c->rv40_loop_filter_strength[1] = rv40_v_loop_filter_strength; if (ARCH_X86) - ff_rv40dsp_init_x86(c, dsp); + ff_rv40dsp_init_x86(c); if (ARCH_ARM) - ff_rv40dsp_init_arm(c, dsp); + ff_rv40dsp_init_arm(c); } diff --git a/libavcodec/x86/rv34dsp_init.c b/libavcodec/x86/rv34dsp_init.c index a93096791b..70f86299bb 100644 --- a/libavcodec/x86/rv34dsp_init.c +++ b/libavcodec/x86/rv34dsp_init.c @@ -31,7 +31,7 @@ void ff_rv34_idct_dc_add_mmx(uint8_t *dst, ptrdiff_t stride, int dc); void ff_rv34_idct_dc_add_sse4(uint8_t *dst, ptrdiff_t stride, int dc); void ff_rv34_idct_add_mmxext(uint8_t *dst, ptrdiff_t stride, int16_t *block); -av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c, DSPContext *dsp) +av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c) { int mm_flags = av_get_cpu_flags(); diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index dea951d4f4..9454e3813b 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -188,7 +188,7 @@ QPEL_FUNCS_SET (OP, 3, 2, OPT) #endif /* HAVE_YASM */ -av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp) +av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c) { #if HAVE_YASM int mm_flags = av_get_cpu_flags(); |