ffmpeg | branch: master | Michael Niedermayer <michae...@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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5403a288a7fae455044d1d937bbf502031915fb4
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
