[FFmpeg-cvslog] Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 16 13:54:41 2013 +0200| [8610751d07bc4c82a8e0cf416c39e845884e6b4d] | committer: Michael Niedermayer

Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860'

* commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860':
  mpegvideo: K&R formatting cosmetics

Conflicts:
	libavcodec/mpegvideo_motion.c

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

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