From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 16 Dec 2013 02:38:13 +0000 (+0100)
Subject: swscale/x86/rgb2rgb_template: try to fix build failure with avx disabled
X-Git-Tag: android-x86-6.0-r1~8275
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f618cb1a4be82c23c114f7ee6eac05a054fe2273;p=android-x86%2Fexternal-ffmpeg.git

swscale/x86/rgb2rgb_template: try to fix build failure with avx disabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

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
 }