Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libswscale / x86 / output.asm

diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm
index a288f088671b0507d81d899a1fed15562b672877..70a2c16bcf3dd8adae596a667e363c90bb3484fc 100644 (file)
--- a/libswscale/x86/output.asm
+++ b/libswscale/x86/output.asm
@@ -264,10 +264,12 @@ yuv2planeX_fn  9,  7, 5
 yuv2planeX_fn 10,  7, 5
 yuv2planeX_fn 16,  8, 5
 
+%ifdef HAVE_AVX
 INIT_XMM avx
 yuv2planeX_fn  8, 10, 7
 yuv2planeX_fn  9,  7, 5
 yuv2planeX_fn 10,  7, 5
+%endif
 
 ; %1=outout-bpc, %2=alignment (u/a)
 %macro yuv2plane1_mainloop 2
@@ -401,8 +403,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