[FFmpeg-cvslog] Merge commit '75439bb31b3ab76f9a4d30c5de4ff9f407ec8128'

Michael Niedermayer git at videolan.org
Tue Feb 3 22:02:31 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb  3 21:53:29 2015 +0100| [46a16ca15a68bfd7341dd9783ecf39bbdf80d08e] | committer: Michael Niedermayer

Merge commit '75439bb31b3ab76f9a4d30c5de4ff9f407ec8128'

* commit '75439bb31b3ab76f9a4d30c5de4ff9f407ec8128':
  siff: K&R formatting cosmetics

Conflicts:
	libavformat/siff.c

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

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





More information about the ffmpeg-cvslog mailing list