[FFmpeg-cvslog] Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul  1 19:58:57 2014 +0200| [8365287e613d82e8fc1e842878cbbe285c1d592d] | committer: Michael Niedermayer

Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'

* commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e':
  matroska: K&R formatting cosmetics

Conflicts:
	libavformat/matroskaenc.c

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

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