ffmpeg | branch: master | Ronald S. Bultje <rsbul...@gmail.com> | Mon Aug 17 07:40:01 2015 -0400| [e3b7298aedd449ff71d445abda6617f2d841289a] | committer: Ronald S. Bultje
lavc: fix compilation with FF_API_XVMC. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3b7298aedd449ff71d445abda6617f2d841289a --- libavcodec/blockdsp.c | 4 ---- libavcodec/blockdsp.h | 4 ---- libavcodec/x86/blockdsp_init.c | 4 ---- 3 files changed, 12 deletions(-) diff --git a/libavcodec/blockdsp.c b/libavcodec/blockdsp.c index 8480f0b..42e177b 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 32ea107..654ecdc 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 7780184..825e29f 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(); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
