diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-02-14 12:03:55 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-02-14 12:03:55 +0100 |
| commit | 186923758ddda054ab50446d24dd51f9fa9fd052 (patch) | |
| tree | 603e35b0c927cd695e225bbf5277fd4bd4deea50 | |
| parent | 1fbd905bbb4ca4c8e15030bb80b6188ef4b0e135 (diff) | |
| download | ffmpeg-186923758ddda054ab50446d24dd51f9fa9fd052.tar.gz | |
Fix compilation with old yasm that does not support AVX.
| -rw-r--r-- | libswscale/x86/input.asm | 6 | ||||
| -rw-r--r-- | libswscale/x86/output.asm | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libswscale/x86/input.asm b/libswscale/x86/input.asm index 50e071a89a..c4174ee65e 100644 --- a/libswscale/x86/input.asm +++ b/libswscale/x86/input.asm @@ -304,8 +304,10 @@ RGB24_FUNCS 10, 12 INIT_XMM ssse3 RGB24_FUNCS 11, 13 +%if HAVE_AVX INIT_XMM avx RGB24_FUNCS 11, 13 +%endif ; %1 = nr. of XMM registers ; %2-5 = rgba, bgra, argb or abgr (in individual characters) @@ -448,8 +450,10 @@ RGB32_FUNCS 0, 0 INIT_XMM sse2 RGB32_FUNCS 8, 12 +%if HAVE_AVX INIT_XMM avx RGB32_FUNCS 8, 12 +%endif ;----------------------------------------------------------------------------- ; YUYV/UYVY/NV12/NV21 packed pixel shuffling. @@ -656,7 +660,7 @@ YUYV_TO_UV_FN 3, uyvy NVXX_TO_UV_FN 5, nv12 NVXX_TO_UV_FN 5, nv21 -%ifdef HAVE_AVX +%if 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 diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm index 646a11dbab..11e89a4269 100644 --- a/libswscale/x86/output.asm +++ b/libswscale/x86/output.asm @@ -264,7 +264,7 @@ yuv2planeX_fn 9, 7, 5 yuv2planeX_fn 10, 7, 5 yuv2planeX_fn 16, 8, 5 -%ifdef HAVE_AVX +%if HAVE_AVX INIT_XMM avx yuv2planeX_fn 8, 10, 7 yuv2planeX_fn 9, 7, 5 @@ -404,7 +404,7 @@ yuv2plane1_fn 16, 6, 3 INIT_XMM sse4 yuv2plane1_fn 16, 5, 3 -%ifdef HAVE_AVX +%if HAVE_AVX INIT_XMM avx yuv2plane1_fn 8, 5, 5 yuv2plane1_fn 9, 5, 3 |