[FFmpeg-cvslog] Merge commit '2c299d4165cd9653153e12270971c2368551b79e'
Michael Niedermayer
git at videolan.org
Fri May 10 23:26:16 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 10 23:16:09 2013 +0200| [5e1278c6401a5e9aef040dd1f458facba4db7e51] | committer: Michael Niedermayer
Merge commit '2c299d4165cd9653153e12270971c2368551b79e'
* commit '2c299d4165cd9653153e12270971c2368551b79e':
x86: sbrdsp: implement SSE2 qmf_pre_shuffle
Conflicts:
libavcodec/x86/sbrdsp.asm
libavcodec/x86/sbrdsp_init.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5e1278c6401a5e9aef040dd1f458facba4db7e51
---
More information about the ffmpeg-cvslog
mailing list