diff options
| author | James Almer <jamrial@gmail.com> | 2015-03-20 02:37:54 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2015-03-20 02:38:20 -0300 |
| commit | 6b940b8c998cd8205a9cd2ebcedb9e34d0a8af45 (patch) | |
| tree | 3fcb8e5d15048e37fcdcdd21370b19a784dd726d /libavcodec | |
| parent | b0fea4ad7e4cc3542d98ff90534fef72d53fd9e1 (diff) | |
x86/xvididct: add some yasm guards
Should fix compilation on compilers with less-than-ideal dead code elimination
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/xvididct_init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/x86/xvididct_init.c b/libavcodec/x86/xvididct_init.c index d63d6259f7..8b9d8de0cd 100644 --- a/libavcodec/x86/xvididct_init.c +++ b/libavcodec/x86/xvididct_init.c @@ -26,7 +26,7 @@ #include "idctdsp.h" #include "xvididct.h" -#if ARCH_X86_32 +#if ARCH_X86_32 && HAVE_YASM static void xvid_idct_mmx_put(uint8_t *dest, int line_size, short *block) { ff_xvid_idct_mmx(block); @@ -55,6 +55,7 @@ static void xvid_idct_mmxext_add(uint8_t *dest, int line_size, short *block) av_cold void ff_xvid_idct_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, unsigned high_bit_depth) { +#if HAVE_YASM int cpu_flags = av_get_cpu_flags(); if (high_bit_depth || @@ -84,4 +85,5 @@ av_cold void ff_xvid_idct_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, c->idct = ff_xvid_idct_sse2; c->perm_type = FF_IDCT_PERM_SSE2; } +#endif /* HAVE_YASM */ } |