diff options
Diffstat (limited to 'libavcodec/x86/blockdsp.c')
| -rw-r--r-- | libavcodec/x86/blockdsp.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libavcodec/x86/blockdsp.c b/libavcodec/x86/blockdsp.c index 9bb5185b89..b047e19ab5 100644 --- a/libavcodec/x86/blockdsp.c +++ b/libavcodec/x86/blockdsp.c @@ -19,13 +19,14 @@ #include <stdint.h> #include "config.h" + #include "libavutil/attributes.h" #include "libavutil/internal.h" #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" + #include "libavcodec/blockdsp.h" -#include "libavcodec/version.h" #if HAVE_INLINE_ASM @@ -87,12 +88,7 @@ static void clear_blocks_sse(int16_t *blocks) #endif /* HAVE_INLINE_ASM */ -#if FF_API_XVMC -av_cold void ff_blockdsp_init_x86(BlockDSPContext *c, - AVCodecContext *avctx) -#else av_cold void ff_blockdsp_init_x86(BlockDSPContext *c) -#endif /* FF_API_XVMC */ { #if HAVE_INLINE_ASM int cpu_flags = av_get_cpu_flags(); @@ -102,14 +98,6 @@ av_cold void ff_blockdsp_init_x86(BlockDSPContext *c) c->clear_blocks = clear_blocks_mmx; } -#if FF_API_XVMC -FF_DISABLE_DEPRECATION_WARNINGS - /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */ - if (CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1) - return; -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_XVMC */ - if (INLINE_SSE(cpu_flags)) { c->clear_block = clear_block_sse; c->clear_blocks = clear_blocks_sse; |