[FFmpeg-cvslog] Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'
Michael Niedermayer
git at videolan.org
Wed Jan 23 13:59:46 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 23 13:54:34 2013 +0100| [b1b870fbd7185bffbe27c5918001b40a8ff8b920] | committer: Michael Niedermayer
Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'
* commit '55aa03b9f8f11ebb7535424cc0e5635558590f49':
floatdsp: move vector_fmul_add from dsputil to avfloatdsp.
Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b1b870fbd7185bffbe27c5918001b40a8ff8b920
---
More information about the ffmpeg-cvslog
mailing list