[FFmpeg-cvslog] Merge commit '2f97094608cfd2665660f7a26a3291559b186752'

Michael Niedermayer git at videolan.org
Mon Jan 6 15:12:40 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 14:57:41 2014 +0100| [b7697d29ed772dd94cb23400154d3e47e326d151] | committer: Michael Niedermayer

Merge commit '2f97094608cfd2665660f7a26a3291559b186752'

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

Conflicts:
	libavcodec/lagarith.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7697d29ed772dd94cb23400154d3e47e326d151
---





More information about the ffmpeg-cvslog mailing list