ffmpeg | branch: release/2.4 | Michael Niedermayer <michae...@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 <michae...@gmx.at>

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



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to