From: Janne Grunau <janne-libav@jannau.net>
Date: Sat, 8 Feb 2014 10:48:19 +0000 (+0100)
Subject: x86: use the inline int8x8_fmul_int32 only if inline SSE2 is availbale
X-Git-Tag: v10_beta1~77
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0cffd6fff59f192120dc93aa6c3cb8180f5506e3;p=platform%2Fupstream%2Flibav.git

x86: use the inline int8x8_fmul_int32 only if inline SSE2 is availbale

Fixes compilation with MSVC. Also does not rely on on earlier config.h
include but include it directly.
---

diff --git a/libavcodec/x86/dca.h b/libavcodec/x86/dca.h
index c14e94f..fbca7ff 100644
--- a/libavcodec/x86/dca.h
+++ b/libavcodec/x86/dca.h
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#if ARCH_X86_64
+#include "config.h"
+
+#if ARCH_X86_64 && HAVE_SSE2_INLINE
 # include "libavutil/x86/asm.h"
 # include "libavutil/mem.h"
 
@@ -49,4 +51,4 @@ static inline void int8x8_fmul_int32(av_unused DCADSPContext *dsp,
     );
 }
 
-#endif /* ARCH_X86_64 */
+#endif /* ARCH_X86_64 && HAVE_SSE2_INLINE */