[FFmpeg-cvslog] Merge commit 'a36947c167d7278b891453083b57dc56b7a7f5c5'
Michael Niedermayer
git at videolan.org
Fri Mar 14 01:18:20 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 01:09:57 2014 +0100| [b7a5f5dc6662ed3d4641063ba62d3d03021db9f8] | committer: Michael Niedermayer
Merge commit 'a36947c167d7278b891453083b57dc56b7a7f5c5'
* commit 'a36947c167d7278b891453083b57dc56b7a7f5c5':
dsputilenc_mmx: K&R formatting cosmetics
Conflicts:
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7a5f5dc6662ed3d4641063ba62d3d03021db9f8
---
More information about the ffmpeg-cvslog
mailing list