[FFmpeg-cvslog] Merge commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  8 20:48:29 2015 +0200| [edaca0812a05523b82039d5be6b1aa069b68b9c6] | committer: Michael Niedermayer

Merge commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d'

* commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d':
  g2meet: K&R formatting cosmetics

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

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