summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2014-12-31 02:15:08 -0300
committerJames Almer <jamrial@gmail.com>2015-02-14 02:21:14 -0300
commita78b7c504a7b5e0a40507f281d70a0e153071f51 (patch)
tree2a68444bd98b761f15615ef8ca13cb4dbc6228c8
parentd66d5d61881f7cd4f511f67186387539de5e9475 (diff)
downloadffmpeg-a78b7c504a7b5e0a40507f281d70a0e153071f51.tar.gz
x86/swr: add missing alignment check to pack_6ch functions
Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 5f14f9e9849579b3418aebfde8a162d9c172d0ea)
-rw-r--r--libswresample/x86/audio_convert.asm2
1 files changed, 2 insertions, 0 deletions
diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm
index b6e9e5d79d..eead735bdf 100644
--- a/libswresample/x86/audio_convert.asm
+++ b/libswresample/x86/audio_convert.asm
@@ -221,6 +221,8 @@ cglobal pack_6ch_%2_to_%1_%3, 2,8,7, dst, src, src1, src2, src3, src4, src5, len
jne pack_6ch_%2_to_%1_u_int %+ SUFFIX
test srcq, mmsize-1
jne pack_6ch_%2_to_%1_u_int %+ SUFFIX
+ test src1q, mmsize-1
+ jne pack_6ch_%2_to_%1_u_int %+ SUFFIX
test src2q, mmsize-1
jne pack_6ch_%2_to_%1_u_int %+ SUFFIX
test src3q, mmsize-1