[FFmpeg-cvslog] Merge commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872'
Michael Niedermayer
git at videolan.org
Mon Jun 1 00:07:35 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 31 23:57:50 2015 +0200| [c140227a8bbc2699b724c9076dc706400eb5cccd] | committer: Michael Niedermayer
Merge commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872'
* commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872':
x86: add AV_CPU_FLAG_AVXSLOW flag
Conflicts:
doc/APIchanges
libavutil/version.h
See: c312bfac4c8ac1ac55d6648fd6eb36db436100f3
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c140227a8bbc2699b724c9076dc706400eb5cccd
---
More information about the ffmpeg-cvslog
mailing list