[FFmpeg-cvslog] swr: fix compilation with ancient toolchain that doesnt support SSSE3

Michael Niedermayer git at videolan.org
Thu Jun 28 11:26:13 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 28 11:12:41 2012 +0200| [782763ed2bad79be254abcd8d3fc2bde7f14c2f5] | committer: Michael Niedermayer

swr: fix compilation with ancient toolchain that doesnt support SSSE3

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libswresample/resample.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libswresample/resample.c b/libswresample/resample.c
index 4e6672c..8c8ef92 100644
--- a/libswresample/resample.c
+++ b/libswresample/resample.c
@@ -393,6 +393,7 @@ int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensatio
 #undef FELEM_MAX
 #undef FILTER_SHIFT
 
+#if HAVE_SSSE3
 #define COMMON_CORE COMMON_CORE_INT16_SSSE3
 #define RENAME(N) N ## _int16_ssse3
 #define FILTER_SHIFT 15
@@ -405,6 +406,7 @@ int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensatio
 #define OUT(d, v) v = (v + (1<<(FILTER_SHIFT-1)))>>FILTER_SHIFT;\
                   d = (unsigned)(v + 32768) > 65535 ? (v>>31) ^ 32767 : v
 #include "resample_template.c"
+#endif
 #endif // ARCH_X86
 
 int swri_multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, AudioData *src, int src_size, int *consumed){
@@ -413,8 +415,11 @@ int swri_multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, Aud
 
     for(i=0; i<dst->ch_count; i++){
 #if ARCH_X86
+#if HAVE_SSSE3
              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 if(c->format == AV_SAMPLE_FMT_S16P && (mm_flags&AV_CPU_FLAG_MMX2 )) ret= swri_resample_int16_mmx2 (c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
+        else
+#endif
+             if(c->format == AV_SAMPLE_FMT_S16P && (mm_flags&AV_CPU_FLAG_MMX2 )) ret= swri_resample_int16_mmx2 (c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
         else
 #endif
              if(c->format == AV_SAMPLE_FMT_S16P) ret= swri_resample_int16(c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);



More information about the ffmpeg-cvslog mailing list