[FFmpeg-devel] [PATCH 2/3] swsresample: Fix unprotected inline asm

Derek Buitenhuis derek.buitenhuis at gmail.com
Fri Sep 7 16:48:28 CEST 2012


Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
---
 libswresample/resample.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libswresample/resample.c b/libswresample/resample.c
index ae08d10..d398d84 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
-- 
1.7.9.5



More information about the ffmpeg-devel mailing list