[FFmpeg-cvslog] x86/swr: add missing alignment check to pack_6ch functions

James Almer git at videolan.org
Thu Feb 12 19:45:53 CET 2015


ffmpeg | branch: release/2.5 | James Almer <jamrial at gmail.com> | Wed Dec 31 02:15:08 2014 -0300| [2a6d16ba5f84fc13a1ad6c718ec08ee42639dc79] | committer: James Almer

x86/swr: add missing alignment check to pack_6ch functions

Reviewed-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit 5f14f9e9849579b3418aebfde8a162d9c172d0ea)

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

 libswresample/x86/audio_convert.asm |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm
index 57d3a89..9bccf3f 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



More information about the ffmpeg-cvslog mailing list