[FFmpeg-cvslog] Merge commit '08e3ea60ff4059341b74be04a428a38f7c3630b0'
Michael Niedermayer
git at videolan.org
Fri Feb 28 20:54:07 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 28 20:38:12 2014 +0100| [baf3adc621feed563f0d12479519c600b26b768c] | committer: Michael Niedermayer
Merge commit '08e3ea60ff4059341b74be04a428a38f7c3630b0'
* commit '08e3ea60ff4059341b74be04a428a38f7c3630b0':
x86: synth filter float: implement SSE2 version
Conflicts:
libavcodec/x86/dcadsp.asm
libavcodec/x86/dcadsp_init.c
See: 2cdbcc004837ce092a14f326f24d97a29512a2c3
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=baf3adc621feed563f0d12479519c600b26b768c
---
More information about the ffmpeg-cvslog
mailing list