[FFmpeg-cvslog] Merge commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5'
Michael Niedermayer
git at videolan.org
Tue Jan 21 22:09:04 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 21 22:03:28 2014 +0100| [ef25595b71817909344ae1d8efc81e0723cab625] | committer: Michael Niedermayer
Merge commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5'
* commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5':
swscale/x86/rgb2rgb: add support for AVX
Conflicts:
libswscale/x86/rgb2rgb_template.c
See: 4729b529e60fb99356a1d9e13793835af50b3e87
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef25595b71817909344ae1d8efc81e0723cab625
---
More information about the ffmpeg-cvslog
mailing list