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>

diff --cc libavutil/x86/lls.asm
index ae18f3a737ffa1b07dabe8e1d9c37a3107c64d93,058a7dcbbdaabaf8ac86dc1933f79f9f08e63877..8bf70a9e55e001da769db343bb93678a457b03bf
--- 1/libavutil/x86/lls.asm
--- 2/libavutil/x86/lls.asm
+++ b/libavutil/x86/lls.asm
@@@ -195,10 -194,10 +195,10 @@@ cglobal update_lls, 3,6,8, ctx, var, co
      jle .loop2x1
  .ret:
      REP_RET
 -
 +%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