[FFmpeg-cvslog] x86: use the inline int8x8_fmul_int32 only if inline SSE2 is availbale

Janne Grunau git at videolan.org
Sat Feb 8 17:07:40 CET 2014


ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Sat Feb  8 11:48:19 2014 +0100| [0cffd6fff59f192120dc93aa6c3cb8180f5506e3] | committer: Janne Grunau

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.

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

 libavcodec/x86/dca.h |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 */



More information about the ffmpeg-cvslog mailing list