[FFmpeg-cvslog] Merge commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 30 10:26:00 2013 +0100| [70737b83f06e34a8b4f9eb70948b2f2ca6711992] | committer: Michael Niedermayer

Merge commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68'

* commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68':
  oggparsetheora: K&R cosmetics, reformat

Conflicts:
	libavformat/oggparsetheora.c

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

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