[FFmpeg-cvslog] Merge commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa' into release/0.10

Michael Niedermayer git at videolan.org
Wed Mar 11 22:15:04 CET 2015


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 11 22:04:04 2015 +0100| [a19a10a53e4a2d83320da8d15e6266d98330b80d] | committer: Michael Niedermayer

Merge commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa' into release/0.10

* commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa':
  x86: Add CPU flag for the i686 cmov instruction

Conflicts:
	doc/APIchanges
	libavutil/avutil.h

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

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





More information about the ffmpeg-cvslog mailing list