diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2012-09-07 10:48:28 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-07 22:29:02 +0200 |
| commit | 5f256f9df2fe3189e8f66456b015903960323980 (patch) | |
| tree | 943520c8def0836959ea63393123d35d007fe00e | |
| parent | d940b0a0f978992be81a3cdd011dca60d830d49e (diff) | |
| download | ffmpeg-5f256f9df2fe3189e8f66456b015903960323980.tar.gz | |
swsresample: Fix unprotected inline asm
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswresample/resample.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswresample/resample.c b/libswresample/resample.c index ae08d10981..d398d84bf3 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -375,7 +375,7 @@ int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensatio #undef FILTER_SHIFT // XXX FIXME the whole C loop should be written in asm so this x86 specific code here isnt needed -#if ARCH_X86 +#if ARCH_X86 && HAVE_MMXEXT_INLINE #include "x86/resample_mmx.h" #define COMMON_CORE COMMON_CORE_INT16_MMX2 #define RENAME(N) N ## _int16_mmx2 @@ -423,7 +423,7 @@ int swri_multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, Aud int need_emms= 0; for(i=0; i<dst->ch_count; i++){ -#if ARCH_X86 +#if ARCH_X86 && HAVE_MMXEXT_INLINE #if HAVE_SSSE3_INLINE if(c->format == AV_SAMPLE_FMT_S16P && (mm_flags&AV_CPU_FLAG_SSSE3)) ret= swri_resample_int16_ssse3(c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count); else |