[FFmpeg-cvslog] Merge commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca'

Michael Niedermayer git at videolan.org
Wed Mar 6 23:45:55 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar  6 23:39:52 2013 +0100| [09131ebb562472effd81726c2c14c3ec7164b695] | committer: Michael Niedermayer

Merge commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca'

* commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca':
  shorten: K&R formatting cosmetics

Conflicts:
	libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09131ebb562472effd81726c2c14c3ec7164b695
---





More information about the ffmpeg-cvslog mailing list