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>
8 years ago · 43a4c729d4
parent 072fad7cf5 75d98e30af
commit 43a4c729d4
1 changed files with 1 additions and 1 deletions
--- 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