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