X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libswresample%2Faudioconvert.c;h=4ba0ff13b16dc4538f795eae71d1e4615dbd2a33;hb=d0bdcbcb28a7536de88cffa00a71be322d84b5d7;hp=d2e3722a406c01817af6c973e679f0f36fa7b942;hpb=d7b20bfbb582c369518c73720fb4b0266714cde6;p=ffmpeg

diff --git a/libswresample/audioconvert.c b/libswresample/audioconvert.c
index d2e3722a406..4ba0ff13b16 100644
--- a/libswresample/audioconvert.c
+++ b/libswresample/audioconvert.c
@@ -170,12 +170,28 @@ int swri_audio_convert(AudioConvert *ctx, AudioData *out, AudioData *in, int len
     int ch;
     int off=0;
     const int os= (out->planar ? 1 :out->ch_count) *out->bps;
+    unsigned misaligned = 0;
 
     av_assert0(ctx->channels == out->ch_count);
 
+    if (ctx->in_simd_align_mask) {
+        int planes = in->planar ? in->ch_count : 1;
+        unsigned m = 0;
+        for (ch = 0; ch < planes; ch++)
+            m |= (intptr_t)in->ch[ch];
+        misaligned |= m & ctx->in_simd_align_mask;
+    }
+    if (ctx->out_simd_align_mask) {
+        int planes = out->planar ? out->ch_count : 1;
+        unsigned m = 0;
+        for (ch = 0; ch < planes; ch++)
+            m |= (intptr_t)out->ch[ch];
+        misaligned |= m & ctx->out_simd_align_mask;
+    }
+
     //FIXME optimize common cases
 
-    if(ctx->simd_f && !ctx->ch_map){
+    if(ctx->simd_f && !ctx->ch_map && !misaligned){
         off = len&~15;
         av_assert1(off>=0);
         av_assert1(off<=len);