diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-16 03:38:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-16 03:38:13 +0100 |
| commit | f618cb1a4be82c23c114f7ee6eac05a054fe2273 (patch) | |
| tree | 3d568f3fdce7643a2cc54b479dad944700c971f7 | |
| parent | fe285b04bbad23ddfac164e22034b5ee76e039a6 (diff) | |
| download | ffmpeg-f618cb1a4be82c23c114f7ee6eac05a054fe2273.tar.gz | |
swscale/x86/rgb2rgb_template: try to fix build failure with avx disabled
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/x86/rgb2rgb_template.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c index 2a2090c2d1..d58219b3fb 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -2525,7 +2525,9 @@ static av_cold void RENAME(rgb2rgb_init)(void) #if !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX interleaveBytes = RENAME(interleaveBytes); #endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX*/ +#if !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL #if !COMPILE_TEMPLATE_AMD3DNOW && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == COMPILE_TEMPLATE_SSE2 && HAVE_YASM deinterleaveBytes = RENAME(deinterleaveBytes); #endif +#endif } |