Merge commit '0cffd6fff59f192120dc93aa6c3cb8180f5506e3'

* commit '0cffd6fff59f192120dc93aa6c3cb8180f5506e3':
  x86: use the inline int8x8_fmul_int32 only if inline SSE2 is availbale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-08 16:59:31 +01:00
commit dd2b330347

View File

@ -18,7 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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/x86/asm.h"
# include "libavutil/mem.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 */