aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2014-02-08 11:48:19 +0100
committerJanne Grunau <janne-libav@jannau.net>2014-02-08 12:10:56 +0100
commit0cffd6fff59f192120dc93aa6c3cb8180f5506e3 (patch)
tree9f2e1e9de1d6b54b90c874630f49b73e765d8c42 /libavcodec/x86
parent5fdbfcb5b793f5849c496214668094a8ec99fa07 (diff)
downloadffmpeg-0cffd6fff59f192120dc93aa6c3cb8180f5506e3.tar.gz
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.
Diffstat (limited to 'libavcodec/x86')
-rw-r--r--libavcodec/x86/dca.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/x86/dca.h b/libavcodec/x86/dca.h
index c14e94f4aa..fbca7ffb32 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 */