[FFmpeg-cvslog] Merge commit '48aef27f5232794e70ecef0d347b9f65e27a9bad'

Michael Niedermayer git at videolan.org
Tue Mar 17 20:33:21 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 17 20:14:48 2015 +0100| [1eb28479dab3d55a9c8aff63e0fb7a1dd3902cf0] | committer: Michael Niedermayer

Merge commit '48aef27f5232794e70ecef0d347b9f65e27a9bad'

* commit '48aef27f5232794e70ecef0d347b9f65e27a9bad':
  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=1eb28479dab3d55a9c8aff63e0fb7a1dd3902cf0
---





More information about the ffmpeg-cvslog mailing list