ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Mon Mar 20 18:44:00 2017 +0100| [43a4c729d4f24a62fa2ca5bf20ba48cf48fa6835] | committer: Clément Bœsch
Merge commit '75d98e30afab61542faab3c0f11880834653bd6b' * commit '75d98e30afab61542faab3c0f11880834653bd6b': audiodsp/x86: clear the high bits of the order parameter on 64bit Merged-by: Clément Bœsch <u...@pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43a4c729d4f24a62fa2ca5bf20ba48cf48fa6835 --- libavcodec/x86/audiodsp.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/x86/audiodsp.asm b/libavcodec/x86/audiodsp.asm index 67a33ff..3eeb6fd 100644 --- a/libavcodec/x86/audiodsp.asm +++ b/libavcodec/x86/audiodsp.asm @@ -26,7 +26,7 @@ SECTION .text %macro SCALARPRODUCT 0 ; int ff_scalarproduct_int16(int16_t *v1, int16_t *v2, int order) cglobal scalarproduct_int16, 3,3,3, v1, v2, order - shl orderq, 1 + add orderd, orderd add v1q, orderq add v2q, orderq neg orderq ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
