lavc: fix compilation with FF_API_XVMC.
authorRonald S. Bultje <rsbultje@gmail.com>
Mon, 17 Aug 2015 11:40:01 +0000 (07:40 -0400)
committerRonald S. Bultje <rsbultje@gmail.com>
Tue, 18 Aug 2015 16:05:57 +0000 (12:05 -0400)
libavcodec/blockdsp.c
libavcodec/blockdsp.h
libavcodec/x86/blockdsp_init.c

index 8480f0b..42e177b 100644 (file)
@@ -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);
 }
index 32ea107..654ecdc 100644 (file)
@@ -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 */
index 7780184..825e29f 100644 (file)
@@ -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();