[FFmpeg-cvslog] Merge commit '8769113accf1f3b78634dec60b37f7354ed6d88d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 19 15:47:44 2013 +0100| [18df75fa2fe2f4177d68715db65ff711475c1166] | committer: Michael Niedermayer

Merge commit '8769113accf1f3b78634dec60b37f7354ed6d88d'

* commit '8769113accf1f3b78634dec60b37f7354ed6d88d':
  mpeg4videoenc: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4videoenc.c

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

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