[FFmpeg-cvslog] Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'
Michael Niedermayer
git at videolan.org
Sat Oct 26 02:46:03 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 26 02:36:20 2013 +0200| [a6657044021527c8d8e5341199bded0e1b7eaec0] | committer: Michael Niedermayer
Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'
* commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4':
libavutil: x86: Add AVX2 capable CPU detection.
Conflicts:
libavutil/cpu.c
libavutil/cpu.h
libavutil/x86/cpu.c
See: 865b70bc5d1cf37ec6d6cb729a69dda2cca28bd5
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a6657044021527c8d8e5341199bded0e1b7eaec0
---
More information about the ffmpeg-cvslog
mailing list