diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 16:59:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 17:06:57 +0100 |
| commit | dd2b3303477764b4a77cf3f2efb5251331d837a0 (patch) | |
| tree | 552cfb5443542c390ab462359c84141b6146b843 | |
| parent | c72f587353d9f88c7fbbbf6ef78b1d9ba3d38fd7 (diff) | |
| parent | 0cffd6fff59f192120dc93aa6c3cb8180f5506e3 (diff) | |
| download | ffmpeg-dd2b3303477764b4a77cf3f2efb5251331d837a0.tar.gz | |
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>
| -rw-r--r-- | libavcodec/x86/dca.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/x86/dca.h b/libavcodec/x86/dca.h index 080e239fdd..5636a7b38f 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 */ |