[FFmpeg-cvslog] x86/mpegaudiodsp.c: msvc compilation error without sse/avx_external

Matt Oliver git at videolan.org
Tue May 6 14:37:25 CEST 2014


ffmpeg | branch: master | Matt Oliver <protogonoi at gmail.com> | Tue May  6 14:42:38 2014 +1000| [ac9869ffb070dce0968f338554f932dda2f8314c] | committer: Michael Niedermayer

x86/mpegaudiodsp.c: msvc compilation error without sse/avx_external

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

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

 libavcodec/x86/mpegaudiodsp.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c
index 163f84b..2723167 100644
--- a/libavcodec/x86/mpegaudiodsp.c
+++ b/libavcodec/x86/mpegaudiodsp.c
@@ -262,6 +262,7 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
 #endif /* HAVE_SSE_INLINE */
 
 #if HAVE_YASM
+#if HAVE_SSE
 #if ARCH_X86_32
     if (EXTERNAL_SSE(cpu_flags)) {
         s->imdct36_blocks_float = imdct36_blocks_sse;
@@ -276,8 +277,11 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
     if (EXTERNAL_SSSE3(cpu_flags)) {
         s->imdct36_blocks_float = imdct36_blocks_ssse3;
     }
+#endif
+#if HAVE_AVX_EXTERNAL
     if (EXTERNAL_AVX(cpu_flags)) {
         s->imdct36_blocks_float = imdct36_blocks_avx;
     }
+#endif
 #endif /* HAVE_YASM */
 }



More information about the ffmpeg-cvslog mailing list