Merge commit '2f97094608cfd2665660f7a26a3291559b186752'

* commit '2f97094608cfd2665660f7a26a3291559b186752':
  lagarith: do not call simd functions on unaligned lines

Conflicts:
	libavcodec/lagarith.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/lagarith.c
Simple merge