diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-20 18:44:00 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-20 18:44:00 +0100 |
| commit | 43a4c729d4f24a62fa2ca5bf20ba48cf48fa6835 (patch) | |
| tree | 4eaae716a918b2a2fbeb1cdbc3a4da32a05f08c0 | |
| parent | 072fad7cf536d4d5be69238bd385d42248b28405 (diff) | |
| parent | 75d98e30afab61542faab3c0f11880834653bd6b (diff) | |
| download | ffmpeg-43a4c729d4f24a62fa2ca5bf20ba48cf48fa6835.tar.gz | |
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>
| -rw-r--r-- | libavcodec/x86/audiodsp.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/audiodsp.asm b/libavcodec/x86/audiodsp.asm index 67a33ff3f4..3eeb6fd67f 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 |