projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3629d1c
)
x86/mpegaudiodec: fix compilation failure on cygwin with undefined imdct36_blocks_avx
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 9 Sep 2012 16:34:21 +0000
(18:34 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 9 Sep 2012 16:39:03 +0000
(18:39 +0200)
this is a regression since today
Found-by: beastd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/mpegaudiodec.c
patch
|
blob
|
history
diff --git
a/libavcodec/x86/mpegaudiodec.c
b/libavcodec/x86/mpegaudiodec.c
index
edf630b
..
cbc1e46
100644
(file)
--- a/
libavcodec/x86/mpegaudiodec.c
+++ b/
libavcodec/x86/mpegaudiodec.c
@@
-252,9
+252,12
@@
void ff_mpadsp_init_mmx(MPADSPContext *s)
#endif /* HAVE_SSE2_INLINE */
#if HAVE_YASM
+#if HAVE_AVX_EXTERNAL
if (EXTERNAL_AVX(mm_flags)) {
s->imdct36_blocks_float = imdct36_blocks_avx;
- } else if (EXTERNAL_SSSE3(mm_flags)) {
+ } else
+#endif
+ if (EXTERNAL_SSSE3(mm_flags)) {
s->imdct36_blocks_float = imdct36_blocks_ssse3;
} else if (EXTERNAL_SSE3(mm_flags)) {
s->imdct36_blocks_float = imdct36_blocks_sse3;