[FFmpeg-cvslog] Merge commit '38675229a879aa5258a8c71891fc8cbf74cf139f'
Michael Niedermayer
git at videolan.org
Fri Mar 14 01:08:37 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 01:01:37 2014 +0100| [d926c4b240edd86d9ee5c1b449968ac91eeaa918] | committer: Michael Niedermayer
Merge commit '38675229a879aa5258a8c71891fc8cbf74cf139f'
* commit '38675229a879aa5258a8c71891fc8cbf74cf139f':
dsputil_mmx: K&R formatting cosmetics
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=d926c4b240edd86d9ee5c1b449968ac91eeaa918
---
More information about the ffmpeg-cvslog
mailing list