[FFmpeg-cvslog] Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  2 18:31:41 2013 +0100| [1654e64bba809d3fde8b4cb8a1615796a218c36f] | committer: Michael Niedermayer

Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58'

* commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58':
  mpeg4video_parser: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4video_parser.c

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

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