diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-01-12 16:35:49 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-01-12 16:35:49 +0100 |
| commit | ef3a19d5950ebe8a07c4e31b65ecf95e03fd85f5 (patch) | |
| tree | b53177345eaaf959c7ce838b419df232f0bb438d /libavcodec/x86 | |
| parent | 05577aafaa75e255a140cd8454fd7c8cffa67965 (diff) | |
| download | ffmpeg-ef3a19d5950ebe8a07c4e31b65ecf95e03fd85f5.tar.gz | |
Fix compilation with yasm-0.6.2
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/imdct36_sse.asm | 4 | ||||
| -rw-r--r-- | libavcodec/x86/proresdsp.asm | 2 | ||||
| -rw-r--r-- | libavcodec/x86/v210-init.c | 4 | ||||
| -rw-r--r-- | libavcodec/x86/v210.asm | 4 |
4 files changed, 12 insertions, 2 deletions
diff --git a/libavcodec/x86/imdct36_sse.asm b/libavcodec/x86/imdct36_sse.asm index 2908459db7..ffca3530a4 100644 --- a/libavcodec/x86/imdct36_sse.asm +++ b/libavcodec/x86/imdct36_sse.asm @@ -371,8 +371,10 @@ DEFINE_IMDCT INIT_XMM ssse3 DEFINE_IMDCT +%ifdef HAVE_AVX INIT_XMM avx DEFINE_IMDCT +%endif INIT_XMM sse @@ -717,5 +719,7 @@ cglobal four_imdct36_float, 5,5,8, out, buf, in, win, tmp INIT_XMM sse DEFINE_FOUR_IMDCT +%ifdef HAVE_AVX INIT_XMM avx DEFINE_FOUR_IMDCT +%endif diff --git a/libavcodec/x86/proresdsp.asm b/libavcodec/x86/proresdsp.asm index d674308c05..f733bdf7cb 100644 --- a/libavcodec/x86/proresdsp.asm +++ b/libavcodec/x86/proresdsp.asm @@ -306,7 +306,9 @@ INIT_XMM idct_put_fn sse2, 16 INIT_XMM idct_put_fn sse4, 16 +%ifdef HAVE_AVX INIT_AVX idct_put_fn avx, 16 +%endif %endif diff --git a/libavcodec/x86/v210-init.c b/libavcodec/x86/v210-init.c index 4dd6d6de8a..425c6284c5 100644 --- a/libavcodec/x86/v210-init.c +++ b/libavcodec/x86/v210-init.c @@ -34,14 +34,14 @@ av_cold void v210_x86_init(V210DecContext *s) if (cpu_flags & AV_CPU_FLAG_SSSE3) s->unpack_frame = ff_v210_planar_unpack_aligned_ssse3; - if (cpu_flags & AV_CPU_FLAG_AVX) + if (HAVE_AVX && cpu_flags & AV_CPU_FLAG_AVX) s->unpack_frame = ff_v210_planar_unpack_aligned_avx; } else { if (cpu_flags & AV_CPU_FLAG_SSSE3) s->unpack_frame = ff_v210_planar_unpack_unaligned_ssse3; - if (cpu_flags & AV_CPU_FLAG_AVX) + if (HAVE_AVX && cpu_flags & AV_CPU_FLAG_AVX) s->unpack_frame = ff_v210_planar_unpack_unaligned_avx; } #endif diff --git a/libavcodec/x86/v210.asm b/libavcodec/x86/v210.asm index 344bed0beb..9ce17c2ed5 100644 --- a/libavcodec/x86/v210.asm +++ b/libavcodec/x86/v210.asm @@ -76,10 +76,14 @@ cglobal v210_planar_unpack_%1_%2, 5, 5 INIT_XMM v210_planar_unpack unaligned, ssse3 +%ifdef HAVE_AVX INIT_AVX v210_planar_unpack unaligned, avx +%endif INIT_XMM v210_planar_unpack aligned, ssse3 +%ifdef HAVE_AVX INIT_AVX v210_planar_unpack aligned, avx +%endif |