[FFmpeg-cvslog] Merge commit '84cfce9f99805a144df684417e166c1ae6f95421'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  7 23:46:37 2014 +0100| [b3d9ab182929c64d65f36035770dc8d1a8513196] | committer: Michael Niedermayer

Merge commit '84cfce9f99805a144df684417e166c1ae6f95421'

* commit '84cfce9f99805a144df684417e166c1ae6f95421':
  matroskadec: K&R formatting cosmetics

Conflicts:
	libavformat/matroskadec.c

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

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