[FFmpeg-cvslog] Merge commit '652f5185945c8405fc57aed353286858df8d066f'
Michael Niedermayer
git at videolan.org
Wed Oct 31 14:06:14 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 31 14:02:35 2012 +0100| [78ec407d5a7ed8a00d49e7555e2cc55e7786fd1d] | committer: Michael Niedermayer
Merge commit '652f5185945c8405fc57aed353286858df8d066f'
* commit '652f5185945c8405fc57aed353286858df8d066f':
x86: mmx2 ---> mmxext in comments and messages
Conflicts:
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78ec407d5a7ed8a00d49e7555e2cc55e7786fd1d
---
More information about the ffmpeg-cvslog
mailing list