[FFmpeg-cvslog] Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 18 13:16:56 2014 +0100| [ceb0d79f46463dc10fb413e7e5ca799967b06475] | committer: Michael Niedermayer

Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a'

* commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a':
  mpegts: K&R formatting cosmetics

Conflicts:
	libavformat/mpegts.c

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

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