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)
* commit '2f97094608cfd2665660f7a26a3291559b186752':
  lagarith: do not call simd functions on unaligned lines

Conflicts:
libavcodec/lagarith.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/lagarith.c

Simple merge