[FFmpeg-cvslog] Merge commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc'
Michael Niedermayer
git at videolan.org
Wed Aug 27 22:25:14 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 27 21:20:39 2014 +0200| [5403a288a7fae455044d1d937bbf502031915fb4] | committer: Michael Niedermayer
Merge commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc'
* commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc':
x86: xvid: K&R formatting cosmetics
Conflicts:
libavcodec/x86/xvididct_sse2.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5403a288a7fae455044d1d937bbf502031915fb4
---
More information about the ffmpeg-cvslog
mailing list