diff --git a/libavcodec/x86/blockdsp.asm b/libavcodec/x86/blockdsp.asm index 9d203df8f5..e380308d4a 100644 --- a/libavcodec/x86/blockdsp.asm +++ b/libavcodec/x86/blockdsp.asm @@ -46,9 +46,6 @@ cglobal clear_block, 1, 1, %1, blocks RET %endmacro -INIT_MMX mmx -%define ZERO pxor -CLEAR_BLOCK 0, 4 INIT_XMM sse %define ZERO xorps CLEAR_BLOCK 1, 2 @@ -78,9 +75,6 @@ cglobal clear_blocks, 1, 2, %1, blocks, len RET %endmacro -INIT_MMX mmx -%define ZERO pxor -CLEAR_BLOCKS 0 INIT_XMM sse %define ZERO xorps CLEAR_BLOCKS 1 diff --git a/libavcodec/x86/blockdsp_init.c b/libavcodec/x86/blockdsp_init.c index d7f8a8e508..b0ff9376d9 100644 --- a/libavcodec/x86/blockdsp_init.c +++ b/libavcodec/x86/blockdsp_init.c @@ -24,10 +24,8 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/blockdsp.h" -void ff_clear_block_mmx(int16_t *block); void ff_clear_block_sse(int16_t *block); void ff_clear_block_avx(int16_t *block); -void ff_clear_blocks_mmx(int16_t *blocks); void ff_clear_blocks_sse(int16_t *blocks); void ff_clear_blocks_avx(int16_t *blocks); @@ -37,11 +35,6 @@ av_cold void ff_blockdsp_init_x86(BlockDSPContext *c, #if HAVE_X86ASM 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_SSE(cpu_flags)) { c->clear_block = ff_clear_block_sse; c->clear_blocks = ff_clear_blocks_sse;