diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-10-20 15:59:22 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-10-20 16:19:13 +0200 |
| commit | 2cb7c8166920aa8dbb969de9befd0981b5a8f2ad (patch) | |
| tree | 600f1e27793adbc247ddd186e67d9ee802425da6 /libavcodec | |
| parent | 463ea05ab24ad0d27b54e985cab1a9a9c953285c (diff) | |
| download | ffmpeg-2cb7c8166920aa8dbb969de9befd0981b5a8f2ad.tar.gz | |
x86: Fix linking of ProRes DSP ASM with YASM disabled.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/proresdsp-init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/proresdsp-init.c b/libavcodec/x86/proresdsp-init.c index 46ba43bc01..f202f9f0cf 100644 --- 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 */ } |