[FFmpeg-cvslog] x86/mpegaudiodec: fix compilation failure on cygwin with undefined imdct36_blocks_avx

Michael Niedermayer git at videolan.org
Sun Sep 9 18:39:53 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep  9 18:34:21 2012 +0200| [44f83930d91fdb249f8b92198d1b4c2ae12d5c48] | committer: Michael Niedermayer

x86/mpegaudiodec: fix compilation failure on cygwin with undefined imdct36_blocks_avx

this is a regression since today

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

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

 libavcodec/x86/mpegaudiodec.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavcodec/x86/mpegaudiodec.c b/libavcodec/x86/mpegaudiodec.c
index edf630b..cbc1e46 100644
--- 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;



More information about the ffmpeg-cvslog mailing list