aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2014-12-31 02:15:08 -0300
committerJames Almer <jamrial@gmail.com>2015-02-12 15:43:43 -0300
commit2a6d16ba5f84fc13a1ad6c718ec08ee42639dc79 (patch)
treebee6e2da0cac0c3433fe83a08e6becda1de03b5e
parentc7e967a7cb0c3daabd73230889f4a5574d1640e6 (diff)
downloadffmpeg-2a6d16ba5f84fc13a1ad6c718ec08ee42639dc79.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 57d3a8951f..9bccf3f842 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