--- libavcodec/arm/dsputil_arm.h | 3 +-- libavcodec/arm/dsputil_init_arm.c | 5 ++--- libavcodec/arm/dsputil_init_armv6.c | 3 +-- libavcodec/dsputil.c | 8 +++----- libavcodec/dsputil.h | 9 +++------ libavcodec/ppc/dsputil_altivec.c | 3 +-- libavcodec/ppc/dsputil_altivec.h | 3 +-- libavcodec/ppc/dsputil_ppc.c | 5 ++--- libavcodec/x86/dsputil_init.c | 5 ++--- libavcodec/x86/dsputil_x86.h | 3 +-- libavcodec/x86/dsputilenc_mmx.c | 3 +-- 11 files changed, 18 insertions(+), 32 deletions(-)
diff --git a/libavcodec/arm/dsputil_arm.h b/libavcodec/arm/dsputil_arm.h index 5b976aa..1265f39 100644 --- a/libavcodec/arm/dsputil_arm.h +++ b/libavcodec/arm/dsputil_arm.h @@ -24,7 +24,6 @@ #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" -void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth); +void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx); #endif /* AVCODEC_ARM_DSPUTIL_ARM_H */ diff --git a/libavcodec/arm/dsputil_init_arm.c b/libavcodec/arm/dsputil_init_arm.c index a8c806a..6fb1b5c 100644 --- a/libavcodec/arm/dsputil_init_arm.c +++ b/libavcodec/arm/dsputil_init_arm.c @@ -28,11 +28,10 @@ #include "libavcodec/dsputil.h" #include "dsputil_arm.h" -av_cold void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth) +av_cold void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx) { int cpu_flags = av_get_cpu_flags(); if (have_armv6(cpu_flags)) - ff_dsputil_init_armv6(c, avctx, high_bit_depth); + ff_dsputil_init_armv6(c, avctx); } diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c index bb93d66..1d47af4 100644 --- a/libavcodec/arm/dsputil_init_armv6.c +++ b/libavcodec/arm/dsputil_init_armv6.c @@ -39,8 +39,7 @@ int ff_pix_abs8_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, int ff_sse16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, int line_size, int h); -av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth) +av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx) { c->pix_abs[0][0] = ff_pix_abs16_armv6; c->pix_abs[0][1] = ff_pix_abs16_x2_armv6; diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 8d0cef2..ba71a99 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -902,8 +902,6 @@ av_cold void ff_dsputil_static_init(void) av_cold void ff_dsputil_init(DSPContext *c, AVCodecContext *avctx) { - const unsigned high_bit_depth = avctx->bits_per_raw_sample > 8; - c->sum_abs_dctelem = sum_abs_dctelem_c; /* TODO [0] 16 [1] 8 */ @@ -946,9 +944,9 @@ av_cold void ff_dsputil_init(DSPContext *c, AVCodecContext *avctx) c->nsse[1] = nsse8_c; if (ARCH_ARM) - ff_dsputil_init_arm(c, avctx, high_bit_depth); + ff_dsputil_init_arm(c, avctx); if (ARCH_PPC) - ff_dsputil_init_ppc(c, avctx, high_bit_depth); + ff_dsputil_init_ppc(c, avctx); if (ARCH_X86) - ff_dsputil_init_x86(c, avctx, high_bit_depth); + ff_dsputil_init_x86(c, avctx); } diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index b189305..350ce1c 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -78,11 +78,8 @@ void ff_dsputil_init(DSPContext *p, AVCodecContext *avctx); void ff_set_cmp(DSPContext *c, me_cmp_func *cmp, int type); -void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth); -void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth); -void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth); +void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx); +void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx); +void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx); #endif /* AVCODEC_DSPUTIL_H */ diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c index 2dfe17b..03844a6 100644 --- a/libavcodec/ppc/dsputil_altivec.c +++ b/libavcodec/ppc/dsputil_altivec.c @@ -741,8 +741,7 @@ static int hadamard8_diff16_altivec(MpegEncContext *s, uint8_t *dst, return score; } -av_cold void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth) +av_cold void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx) { c->pix_abs[0][1] = sad16_x2_altivec; c->pix_abs[0][2] = sad16_y2_altivec; diff --git a/libavcodec/ppc/dsputil_altivec.h b/libavcodec/ppc/dsputil_altivec.h index bbf9a9d..922a422 100644 --- a/libavcodec/ppc/dsputil_altivec.h +++ b/libavcodec/ppc/dsputil_altivec.h @@ -27,7 +27,6 @@ #include "libavcodec/dsputil.h" -void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth); +void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx); #endif /* AVCODEC_PPC_DSPUTIL_ALTIVEC_H */ diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index 890157f..c4f8f78 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -29,10 +29,9 @@ #include "libavcodec/dsputil.h" #include "dsputil_altivec.h" -av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth) +av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx) { if (PPC_ALTIVEC(av_get_cpu_flags())) { - ff_dsputil_init_altivec(c, avctx, high_bit_depth); + ff_dsputil_init_altivec(c, avctx); } } diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c index 137f925..77d0d0e 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/dsputil_init.c @@ -24,9 +24,8 @@ #include "libavcodec/dsputil.h" #include "dsputil_x86.h" -av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth) +av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx) { if (CONFIG_ENCODERS) - ff_dsputilenc_init_mmx(c, avctx, high_bit_depth); + ff_dsputilenc_init_mmx(c, avctx); } diff --git a/libavcodec/x86/dsputil_x86.h b/libavcodec/x86/dsputil_x86.h index b6bddf2..20cd3aa 100644 --- a/libavcodec/x86/dsputil_x86.h +++ b/libavcodec/x86/dsputil_x86.h @@ -27,8 +27,7 @@ #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" -void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth); +void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx); void ff_dsputil_init_pix_mmx(DSPContext *c, AVCodecContext *avctx); #endif /* AVCODEC_X86_DSPUTIL_X86_H */ diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 5a7d911..5a33b2f 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -813,8 +813,7 @@ hadamard_func(mmxext) hadamard_func(sse2) hadamard_func(ssse3) -av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx, - unsigned high_bit_depth) +av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx) { int cpu_flags = av_get_cpu_flags(); -- 1.8.3.2 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel