[FFmpeg-cvslog] Merge commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46'
Michael Niedermayer
git at videolan.org
Sun Jan 27 15:58:03 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 27 13:49:57 2013 +0100| [91c8921d807be9a3c542967a7cb99758a16b41fe] | committer: Michael Niedermayer
Merge commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46'
* commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46':
dsputil: x86: Convert mpeg4 qpel and dsputil avg to yasm
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91c8921d807be9a3c542967a7cb99758a16b41fe
---
More information about the ffmpeg-cvslog
mailing list