diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-01 02:26:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-01 02:26:22 +0200 |
| commit | 4e488ac5f5c077baefc61f7a8a04b896292e317e (patch) | |
| tree | 92acbd15a20ab9510d0471904714607dc9e9f71d /libavutil | |
| parent | 709cae2bcbc0ea2c5d46c932b3d8301cf8f98e6b (diff) | |
| parent | 1221bb623978c013046bcb8e5af7f6b9b418a10e (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: lpc: fix a segfault in av_evaluate_lls_sse2()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/lls.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/x86/lls.asm b/libavutil/x86/lls.asm index ae18f3a737..8bf70a9e55 100644 --- a/libavutil/x86/lls.asm +++ b/libavutil/x86/lls.asm @@ -198,7 +198,7 @@ cglobal update_lls, 3,6,8, ctx, var, count, i, j, count2 %endif INIT_XMM sse2 -cglobal evaluate_lls, 2,4,2, ctx, var, order, i +cglobal evaluate_lls, 3,4,2, ctx, var, order, i ; This function is often called on the same buffer as update_lls, but with ; an offset. They can't both be aligned. ; Load halves rather than movu to avoid store-forwarding stalls, since the |