[FFmpeg-devel] [PATCH 2/2] x86/blockdsp: add missing FF_API_XVMC guards

James Almer jamrial at gmail.com
Thu Jun 19 06:00:18 CEST 2014


Signed-off-by: James Almer <jamrial at gmail.com>
---
 libavcodec/x86/blockdsp_mmx.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/x86/blockdsp_mmx.c b/libavcodec/x86/blockdsp_mmx.c
index 7780184..8e7da22 100644
--- a/libavcodec/x86/blockdsp_mmx.c
+++ b/libavcodec/x86/blockdsp_mmx.c
@@ -47,9 +47,11 @@ av_cold void ff_blockdsp_init_x86(BlockDSPContext *c, unsigned high_bit_depth)
             c->clear_blocks = ff_clear_blocks_mmx;
         }
 
+#if FF_API_XVMC
     /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */
     if (CONFIG_XVMC && avctx->hwaccel && avctx->hwaccel->decode_mb)
         return;
+#endif /* FF_API_XVMC */
 
         if (EXTERNAL_SSE(cpu_flags)) {
             c->clear_block  = ff_clear_block_sse;
-- 
1.8.5.5



More information about the ffmpeg-devel mailing list