[FFmpeg-cvslog] Merge commit '2af720fe5f0418612a8fc26b0147a0e10414fcbe' into release/2.4

Michael Niedermayer git at videolan.org
Tue May 19 20:47:46 CEST 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Tue May 19 20:39:42 2015 +0200| [b8d3c3ea86042300dab0b3b9ac31448f47f1c460] | committer: Michael Niedermayer

Merge commit '2af720fe5f0418612a8fc26b0147a0e10414fcbe' into release/2.4

* commit '2af720fe5f0418612a8fc26b0147a0e10414fcbe':
  x86: Put COPY3_IF_LT under HAVE_6REGS

Conflicts:
	libavcodec/x86/mathops.h

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

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





More information about the ffmpeg-cvslog mailing list