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 /libswscale | |
| parent | 05577aafaa75e255a140cd8454fd7c8cffa67965 (diff) | |
| download | ffmpeg-ef3a19d5950ebe8a07c4e31b65ecf95e03fd85f5.tar.gz | |
Fix compilation with yasm-0.6.2
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/x86/input.asm | 2 | ||||
| -rw-r--r-- | libswscale/x86/output.asm | 4 | ||||
| -rw-r--r-- | libswscale/x86/swscale_mmx.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/libswscale/x86/input.asm b/libswscale/x86/input.asm index 0e54522ca7..b1ee82cd0a 100644 --- a/libswscale/x86/input.asm +++ b/libswscale/x86/input.asm @@ -233,6 +233,7 @@ YUYV_TO_UV_FN 3, uyvy NVXX_TO_UV_FN 5, nv12 NVXX_TO_UV_FN 5, nv21 +%ifdef HAVE_AVX INIT_XMM avx ; in theory, we could write a yuy2-to-y using vpand (i.e. AVX), but ; that's not faster in practice @@ -240,3 +241,4 @@ YUYV_TO_UV_FN 3, yuyv YUYV_TO_UV_FN 3, uyvy, 1 NVXX_TO_UV_FN 5, nv12 NVXX_TO_UV_FN 5, nv21 +%endif diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm index 0ec2038d1d..ff72677b9a 100644 --- a/libswscale/x86/output.asm +++ b/libswscale/x86/output.asm @@ -265,10 +265,12 @@ yuv2planeX_fn sse4, 9, 7, 5 yuv2planeX_fn sse4, 10, 7, 5 yuv2planeX_fn sse4, 16, 8, 5 +%ifdef HAVE_AVX INIT_AVX yuv2planeX_fn avx, 8, 10, 7 yuv2planeX_fn avx, 9, 7, 5 yuv2planeX_fn avx, 10, 7, 5 +%endif ; %1=outout-bpc, %2=alignment (u/a) %macro yuv2plane1_mainloop 2 @@ -402,8 +404,10 @@ yuv2plane1_fn 16, 6, 3 INIT_XMM sse4 yuv2plane1_fn 16, 5, 3 +%ifdef HAVE_AVX INIT_XMM avx yuv2plane1_fn 8, 5, 5 yuv2plane1_fn 9, 5, 3 yuv2plane1_fn 10, 5, 3 yuv2plane1_fn 16, 5, 3 +%endif diff --git a/libswscale/x86/swscale_mmx.c b/libswscale/x86/swscale_mmx.c index 66c4f69394..d0bb861618 100644 --- a/libswscale/x86/swscale_mmx.c +++ b/libswscale/x86/swscale_mmx.c @@ -465,7 +465,7 @@ switch(c->dstBpc){ \ c->yuv2plane1 = ff_yuv2plane1_16_sse4; } - if (cpu_flags & AV_CPU_FLAG_AVX) { + if (HAVE_AVX && cpu_flags & AV_CPU_FLAG_AVX) { ASSIGN_VSCALEX_FUNC(c->yuv2planeX, avx,); ASSIGN_VSCALE_FUNC(c->yuv2plane1, avx, avx, 1); |