[FFmpeg-cvslog] Merge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'
Michael Niedermayer
git at videolan.org
Sat Mar 22 22:16:37 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 22 22:11:17 2014 +0100| [8fbc6e59118d2cc10a712ea8de0e10d2d984bcee] | committer: Michael Niedermayer
Merge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'
* commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd':
x86: dsputil: Move inline assembly macros to a separate header
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=8fbc6e59118d2cc10a712ea8de0e10d2d984bcee
---
More information about the ffmpeg-cvslog
mailing list