aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2015-08-17 07:40:01 -0400
committerRonald S. Bultje <rsbultje@gmail.com>2015-08-18 12:05:57 -0400
commite3b7298aedd449ff71d445abda6617f2d841289a (patch)
treec451c3a994fa53cc1fb2bc86c46f9fb494e9358d
parentad45121d562d99c07ab8f77b01ba4bc610dbe0c0 (diff)
downloadffmpeg-e3b7298aedd449ff71d445abda6617f2d841289a.tar.gz
lavc: fix compilation with FF_API_XVMC.
-rw-r--r--libavcodec/blockdsp.c4
-rw-r--r--libavcodec/blockdsp.h4
-rw-r--r--libavcodec/x86/blockdsp_init.c4
3 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/blockdsp.c b/libavcodec/blockdsp.c
index 8480f0b2fe..42e177bae6 100644
--- a/libavcodec/blockdsp.c
+++ b/libavcodec/blockdsp.c
@@ -72,11 +72,7 @@ av_cold void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx)
if (ARCH_PPC)
ff_blockdsp_init_ppc(c, high_bit_depth);
if (ARCH_X86)
-#if FF_API_XVMC
ff_blockdsp_init_x86(c, high_bit_depth, avctx);
-#else
- ff_blockdsp_init_x86(c, high_bit_depth);
-#endif /* FF_API_XVMC */
if (ARCH_MIPS)
ff_blockdsp_init_mips(c, high_bit_depth);
}
diff --git a/libavcodec/blockdsp.h b/libavcodec/blockdsp.h
index 32ea10752a..654ecdc3d8 100644
--- a/libavcodec/blockdsp.h
+++ b/libavcodec/blockdsp.h
@@ -43,12 +43,8 @@ void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx);
void ff_blockdsp_init_alpha(BlockDSPContext *c, unsigned high_bit_depth);
void ff_blockdsp_init_arm(BlockDSPContext *c, unsigned high_bit_depth);
void ff_blockdsp_init_ppc(BlockDSPContext *c, unsigned high_bit_depth);
-#if FF_API_XVMC
void ff_blockdsp_init_x86(BlockDSPContext *c, unsigned high_bit_depth,
AVCodecContext *avctx);
-#else
-void ff_blockdsp_init_x86(BlockDSPContext *c, unsigned high_bit_depth);
-#endif /* FF_API_XVMC */
void ff_blockdsp_init_mips(BlockDSPContext *c, unsigned high_bit_depth);
#endif /* AVCODEC_BLOCKDSP_H */
diff --git a/libavcodec/x86/blockdsp_init.c b/libavcodec/x86/blockdsp_init.c
index 7780184af6..825e29f9d2 100644
--- a/libavcodec/x86/blockdsp_init.c
+++ b/libavcodec/x86/blockdsp_init.c
@@ -31,12 +31,8 @@ void ff_clear_block_sse(int16_t *block);
void ff_clear_blocks_mmx(int16_t *blocks);
void ff_clear_blocks_sse(int16_t *blocks);
-#if FF_API_XVMC
av_cold void ff_blockdsp_init_x86(BlockDSPContext *c, unsigned high_bit_depth,
AVCodecContext *avctx)
-#else
-av_cold void ff_blockdsp_init_x86(BlockDSPContext *c, unsigned high_bit_depth)
-#endif /* FF_API_XVMC */
{
#if HAVE_YASM
int cpu_flags = av_get_cpu_flags();