x86: Fix linking of ProRes DSP ASM with YASM disabled.

13 years ago · 2cb7c81669
parent 463ea05ab2
commit 2cb7c81669
1 changed files with 3 additions and 3 deletions
--- a/libavcodec/x86/proresdsp-init.c
+++ b/libavcodec/x86/proresdsp-init.c
@ -31,7 +31,7 @@ void ff_prores_idct_put_10_avx (uint16_t *dst, int linesize,

 void ff_proresdsp_x86_init(ProresDSPContext *dsp)
 {
-#if ARCH_X86_64
+#if ARCH_X86_64 && HAVE_YASM
    int flags = av_get_cpu_flags();

    if (flags & AV_CPU_FLAG_SSE2) {
@ -49,6 +49,6 @@ void ff_proresdsp_x86_init(ProresDSPContext *dsp)
        dsp->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
        dsp->idct_put = ff_prores_idct_put_10_avx;
    }
-#endif
-#endif
+#endif /* HAVE_AVX */
+#endif /* ARCH_X86_64 && HAVE_YASM */
 }