diff --git a/libavcodec/alpha/blockdsp_alpha.c b/libavcodec/alpha/blockdsp_alpha.c index d8b6f8a145..c6f0964607 100644 --- a/libavcodec/alpha/blockdsp_alpha.c +++ b/libavcodec/alpha/blockdsp_alpha.c @@ -45,5 +45,5 @@ static void clear_blocks_axp(int16_t *blocks) { av_cold void ff_blockdsp_init_alpha(BlockDSPContext *c) { - c->clear_blocks = clear_blocks_axp; + c->clear_blocks = clear_blocks_axp; } diff --git a/libavcodec/arm/blockdsp_init_neon.c b/libavcodec/arm/blockdsp_init_neon.c index 37819c6f0e..87c0d6d6eb 100644 --- a/libavcodec/arm/blockdsp_init_neon.c +++ b/libavcodec/arm/blockdsp_init_neon.c @@ -30,6 +30,6 @@ void ff_clear_blocks_neon(int16_t *blocks); av_cold void ff_blockdsp_init_neon(BlockDSPContext *c) { - c->clear_block = ff_clear_block_neon; - c->clear_blocks = ff_clear_blocks_neon; + c->clear_block = ff_clear_block_neon; + c->clear_blocks = ff_clear_blocks_neon; } diff --git a/libavcodec/blockdsp.h b/libavcodec/blockdsp.h index dddac72cf8..95e1d0f32e 100644 --- a/libavcodec/blockdsp.h +++ b/libavcodec/blockdsp.h @@ -43,8 +43,7 @@ void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx); void ff_blockdsp_init_alpha(BlockDSPContext *c); void ff_blockdsp_init_arm(BlockDSPContext *c); void ff_blockdsp_init_ppc(BlockDSPContext *c); -void ff_blockdsp_init_x86(BlockDSPContext *c, - AVCodecContext *avctx); +void ff_blockdsp_init_x86(BlockDSPContext *c, AVCodecContext *avctx); void ff_blockdsp_init_mips(BlockDSPContext *c); #endif /* AVCODEC_BLOCKDSP_H */ diff --git a/libavcodec/ppc/blockdsp.c b/libavcodec/ppc/blockdsp.c index 65d2feffec..45c492ab3b 100644 --- a/libavcodec/ppc/blockdsp.c +++ b/libavcodec/ppc/blockdsp.c @@ -146,21 +146,21 @@ static void clear_block_altivec(int16_t *block) av_cold void ff_blockdsp_init_ppc(BlockDSPContext *c) { // common optimizations whether AltiVec is available or not - switch (check_dcbzl_effect()) { - case 32: - c->clear_blocks = clear_blocks_dcbz32_ppc; - break; - case 128: - c->clear_blocks = clear_blocks_dcbz128_ppc; - break; - default: - break; - } + switch (check_dcbzl_effect()) { + case 32: + c->clear_blocks = clear_blocks_dcbz32_ppc; + break; + case 128: + c->clear_blocks = clear_blocks_dcbz128_ppc; + break; + default: + break; + } #if HAVE_ALTIVEC if (!PPC_ALTIVEC(av_get_cpu_flags())) return; - c->clear_block = clear_block_altivec; + c->clear_block = clear_block_altivec; #endif /* HAVE_ALTIVEC */ } diff --git a/libavcodec/x86/blockdsp_init.c b/libavcodec/x86/blockdsp_init.c index 18322f39fd..21599934ff 100644 --- a/libavcodec/x86/blockdsp_init.c +++ b/libavcodec/x86/blockdsp_init.c @@ -37,18 +37,18 @@ av_cold void ff_blockdsp_init_x86(BlockDSPContext *c, #if HAVE_YASM int cpu_flags = av_get_cpu_flags(); - if (EXTERNAL_MMX(cpu_flags)) { - c->clear_block = ff_clear_block_mmx; - c->clear_blocks = ff_clear_blocks_mmx; - } + if (EXTERNAL_MMX(cpu_flags)) { + c->clear_block = ff_clear_block_mmx; + c->clear_blocks = ff_clear_blocks_mmx; + } /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */ if (CONFIG_XVMC && avctx->hwaccel && avctx->hwaccel->decode_mb) return; - if (EXTERNAL_SSE(cpu_flags)) { - c->clear_block = ff_clear_block_sse; - c->clear_blocks = ff_clear_blocks_sse; - } + if (EXTERNAL_SSE(cpu_flags)) { + c->clear_block = ff_clear_block_sse; + c->clear_blocks = ff_clear_blocks_sse; + } #endif /* HAVE_YASM */ }