Merge commit '2d518aec4c781316092be65893b47922c8f71b67'

[ffmpeg] / libavcodec / x86 / blockdsp_init.c

diff --git a/libavcodec/x86/blockdsp_init.c b/libavcodec/x86/blockdsp_init.c
index 21599934ff8944de988397588068e0b4912f6d33..afd25e1cbb378b9d98f594c62311c7251a87b92f 100644 (file)
--- a/libavcodec/x86/blockdsp_init.c
+++ b/libavcodec/x86/blockdsp_init.c
@@ -34,7 +34,7 @@ void ff_clear_blocks_sse(int16_t *blocks);
 av_cold void ff_blockdsp_init_x86(BlockDSPContext *c,
                                   AVCodecContext *avctx)
 {
-#if HAVE_YASM
+#if HAVE_X86ASM
     int cpu_flags = av_get_cpu_flags();
 
     if (EXTERNAL_MMX(cpu_flags)) {
@@ -50,5 +50,5 @@ av_cold void ff_blockdsp_init_x86(BlockDSPContext *c,
         c->clear_block  = ff_clear_block_sse;
         c->clear_blocks = ff_clear_blocks_sse;
     }
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
 }