blockdsp: reindent after parameter removal

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
pull/118/merge
Christophe Gisquet 9 years ago committed by Michael Niedermayer
parent c4c389aa14
commit f827a17005
  1. 2
      libavcodec/alpha/blockdsp_alpha.c
  2. 4
      libavcodec/arm/blockdsp_init_neon.c
  3. 3
      libavcodec/blockdsp.h
  4. 22
      libavcodec/ppc/blockdsp.c
  5. 16
      libavcodec/x86/blockdsp_init.c

@ -45,5 +45,5 @@ static void clear_blocks_axp(int16_t *blocks) {
av_cold void ff_blockdsp_init_alpha(BlockDSPContext *c) av_cold void ff_blockdsp_init_alpha(BlockDSPContext *c)
{ {
c->clear_blocks = clear_blocks_axp; c->clear_blocks = clear_blocks_axp;
} }

@ -30,6 +30,6 @@ void ff_clear_blocks_neon(int16_t *blocks);
av_cold void ff_blockdsp_init_neon(BlockDSPContext *c) av_cold void ff_blockdsp_init_neon(BlockDSPContext *c)
{ {
c->clear_block = ff_clear_block_neon; c->clear_block = ff_clear_block_neon;
c->clear_blocks = ff_clear_blocks_neon; c->clear_blocks = ff_clear_blocks_neon;
} }

@ -43,8 +43,7 @@ void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx);
void ff_blockdsp_init_alpha(BlockDSPContext *c); void ff_blockdsp_init_alpha(BlockDSPContext *c);
void ff_blockdsp_init_arm(BlockDSPContext *c); void ff_blockdsp_init_arm(BlockDSPContext *c);
void ff_blockdsp_init_ppc(BlockDSPContext *c); void ff_blockdsp_init_ppc(BlockDSPContext *c);
void ff_blockdsp_init_x86(BlockDSPContext *c, void ff_blockdsp_init_x86(BlockDSPContext *c, AVCodecContext *avctx);
AVCodecContext *avctx);
void ff_blockdsp_init_mips(BlockDSPContext *c); void ff_blockdsp_init_mips(BlockDSPContext *c);
#endif /* AVCODEC_BLOCKDSP_H */ #endif /* AVCODEC_BLOCKDSP_H */

@ -146,21 +146,21 @@ static void clear_block_altivec(int16_t *block)
av_cold void ff_blockdsp_init_ppc(BlockDSPContext *c) av_cold void ff_blockdsp_init_ppc(BlockDSPContext *c)
{ {
// common optimizations whether AltiVec is available or not // common optimizations whether AltiVec is available or not
switch (check_dcbzl_effect()) { switch (check_dcbzl_effect()) {
case 32: case 32:
c->clear_blocks = clear_blocks_dcbz32_ppc; c->clear_blocks = clear_blocks_dcbz32_ppc;
break; break;
case 128: case 128:
c->clear_blocks = clear_blocks_dcbz128_ppc; c->clear_blocks = clear_blocks_dcbz128_ppc;
break; break;
default: default:
break; break;
} }
#if HAVE_ALTIVEC #if HAVE_ALTIVEC
if (!PPC_ALTIVEC(av_get_cpu_flags())) if (!PPC_ALTIVEC(av_get_cpu_flags()))
return; return;
c->clear_block = clear_block_altivec; c->clear_block = clear_block_altivec;
#endif /* HAVE_ALTIVEC */ #endif /* HAVE_ALTIVEC */
} }

@ -37,18 +37,18 @@ av_cold void ff_blockdsp_init_x86(BlockDSPContext *c,
#if HAVE_YASM #if HAVE_YASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_MMX(cpu_flags)) { if (EXTERNAL_MMX(cpu_flags)) {
c->clear_block = ff_clear_block_mmx; c->clear_block = ff_clear_block_mmx;
c->clear_blocks = ff_clear_blocks_mmx; c->clear_blocks = ff_clear_blocks_mmx;
} }
/* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */ /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */
if (CONFIG_XVMC && avctx->hwaccel && avctx->hwaccel->decode_mb) if (CONFIG_XVMC && avctx->hwaccel && avctx->hwaccel->decode_mb)
return; return;
if (EXTERNAL_SSE(cpu_flags)) { if (EXTERNAL_SSE(cpu_flags)) {
c->clear_block = ff_clear_block_sse; c->clear_block = ff_clear_block_sse;
c->clear_blocks = ff_clear_blocks_sse; c->clear_blocks = ff_clear_blocks_sse;
} }
#endif /* HAVE_YASM */ #endif /* HAVE_YASM */
} }

Loading…
Cancel
Save