videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-10-06 18:15:03 +02:00
Code Releases Activity

lavc: fix compilation with FF_API_XVMC.

Browse Source
This commit is contained in:
Ronald S. Bultje 2015-08-17 07:40:01 -04:00
parent ad45121d56
commit e3b7298aed
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/blockdsp.c
View File

@ -72,11 +72,7 @@ av_cold void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx)
if (ARCH_PPC) if (ARCH_PPC)
ff_blockdsp_init_ppc(c, high_bit_depth); ff_blockdsp_init_ppc(c, high_bit_depth);
if (ARCH_X86) if (ARCH_X86)
#if FF_API_XVMC
ff_blockdsp_init_x86(c, high_bit_depth, avctx); 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) if (ARCH_MIPS)
ff_blockdsp_init_mips(c, high_bit_depth); ff_blockdsp_init_mips(c, high_bit_depth);
} }

4
libavcodec/blockdsp.h
View 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_alpha(BlockDSPContext *c, unsigned high_bit_depth);
void ff_blockdsp_init_arm(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); 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, void ff_blockdsp_init_x86(BlockDSPContext *c, unsigned high_bit_depth,
AVCodecContext *avctx); 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); void ff_blockdsp_init_mips(BlockDSPContext *c, unsigned high_bit_depth);
#endif /* AVCODEC_BLOCKDSP_H */ #endif /* AVCODEC_BLOCKDSP_H */

4
libavcodec/x86/blockdsp_init.c
View 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_mmx(int16_t *blocks);
void ff_clear_blocks_sse(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, av_cold void ff_blockdsp_init_x86(BlockDSPContext *c, unsigned high_bit_depth,
AVCodecContext *avctx) AVCodecContext *avctx)
#else
av_cold void ff_blockdsp_init_x86(BlockDSPContext *c, unsigned high_bit_depth)
#endif /* FF_API_XVMC */
{ {
#if HAVE_YASM #if HAVE_YASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();