[FFmpeg-cvslog] Merge commit '566b7a20fd0cab44d344329538d314454a0bcc2f'
Michael Niedermayer
git at videolan.org
Fri May 3 12:03:08 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 3 11:57:59 2013 +0200| [e91339cde25afff244b1f5cb2fc206f3dc9570d8] | committer: Michael Niedermayer
Merge commit '566b7a20fd0cab44d344329538d314454a0bcc2f'
* commit '566b7a20fd0cab44d344329538d314454a0bcc2f':
x86: float dsp: butterflies_float SSE
Conflicts:
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e91339cde25afff244b1f5cb2fc206f3dc9570d8
---
More information about the ffmpeg-cvslog
mailing list