]> git.sesse.net Git - ffmpeg/commit
Merge commit '566b7a20fd0cab44d344329538d314454a0bcc2f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 09:57:59 +0000 (11:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 09:57:59 +0000 (11:57 +0200)
commite91339cde25afff244b1f5cb2fc206f3dc9570d8
treefc23bde73da66645989c6941f069774a640cb009
parent550defe16eeae2819f19751d9e323713999d9a65
parent566b7a20fd0cab44d344329538d314454a0bcc2f
Merge commit '566b7a20fd0cab44d344329538d314454a0bcc2f'

* commit '566b7a20fd0cab44d344329538d314454a0bcc2f':
  x86: float dsp: butterflies_float SSE

Conflicts:
libavutil/x86/float_dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/x86/float_dsp.asm