[FFmpeg-cvslog] Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  2 10:30:30 2013 +0100| [1344c0453615a1f0141b11f5f4e3c640ee890afc] | committer: Michael Niedermayer

Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'

* commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0':
  mpeg4video: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4video.h

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

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