[FFmpeg-cvslog] Merge commit '987a8f8514e07aba8136d491949d0b8d6bb183f9' into release/2.2
Michael Niedermayer
git at videolan.org
Mon Jun 1 12:14:05 CEST 2015
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 1 12:02:06 2015 +0200| [62355b25ad5cdeca4f7b0380fc5ccc8714073be1] | committer: Michael Niedermayer
Merge commit '987a8f8514e07aba8136d491949d0b8d6bb183f9' into release/2.2
* commit '987a8f8514e07aba8136d491949d0b8d6bb183f9':
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=62355b25ad5cdeca4f7b0380fc5ccc8714073be1
---
More information about the ffmpeg-cvslog
mailing list