[FFmpeg-cvslog] swscale/x86/rgb2rgb_template: try to fix build failure with avx disabled

Michael Niedermayer git at videolan.org
Mon Dec 16 03:54:33 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 16 03:38:13 2013 +0100| [f618cb1a4be82c23c114f7ee6eac05a054fe2273] | committer: Michael Niedermayer

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f618cb1a4be82c23c114f7ee6eac05a054fe2273
---

 libswscale/x86/rgb2rgb_template.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c
index 2a2090c..d58219b 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
 }



More information about the ffmpeg-cvslog mailing list