[FFmpeg-cvslog] Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c'
Michael Niedermayer
git at videolan.org
Fri Mar 1 13:44:29 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 1 13:39:47 2013 +0100| [1a7166a58d697ac43eda546f4ccbddeb0e078196] | committer: Michael Niedermayer
Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c'
* commit 'e8c52271c45ec27d783e74238dcfad0c2008731c':
Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."
Conflicts:
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a7166a58d697ac43eda546f4ccbddeb0e078196
---
More information about the ffmpeg-cvslog
mailing list