Merge commit '2f97094608cfd2665660f7a26a3291559b186752'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 13:57:41 +0000 (14:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 14:07:35 +0000 (15:07 +0100)
commitb7697d29ed772dd94cb23400154d3e47e326d151
treef725d8cec30ad890e1b7bbee15b8d27aff365c4e
parente86cd37a7026d277e81413cbdde06556742791bb
parent2f97094608cfd2665660f7a26a3291559b186752
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>
libavcodec/lagarith.c