OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fe285b0
)
swscale/x86/rgb2rgb_template: try to fix build failure with avx disabled
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 16 Dec 2013 02:38:13 +0000
(
03:38
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 16 Dec 2013 02:38:13 +0000
(
03:38
+0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/x86/rgb2rgb_template.c
patch
|
blob
|
history
diff --git
a/libswscale/x86/rgb2rgb_template.c
b/libswscale/x86/rgb2rgb_template.c
index
2a2090c
..
d58219b
100644
(file)
--- 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
}