[FFmpeg-cvslog] Merge commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 10 09:04:22 2013 +0200| [7824b5f6f5b6200f362017960de413748d917a06] | committer: Michael Niedermayer

Merge commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9'

* commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9':
  vmnc: K&R formatting cosmetics

Conflicts:
	libavcodec/vmnc.c

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

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