[FFmpeg-cvslog] Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 05:28:07 2014 +0100| [fecebb7abab6cac2dc07393f1d2f2463305dcd31] | committer: Michael Niedermayer

Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'

* commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7':
  mpeg: K&R formatting cosmetics

Conflicts:
	libavformat/mpeg.c

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

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