[FFmpeg-cvslog] Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul  8 04:08:07 2013 +0200| [4cd066b69c08cd91aa4b5e40deb4b2f5c7e651ee] | committer: Michael Niedermayer

Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

* commit '21732063a346475eb22c332b27e8216b79f9ad4a':
  movenc: K&R formatting cosmetics

Conflicts:
	libavformat/movenc.c

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

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