[FFmpeg-cvslog] Merge commit 'a801453423420915425f902bf9f9cbe982a55d87'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  9 00:41:47 2014 +0100| [17a5dbacf50cafbf4034732ad09f252c076bf26c] | committer: Michael Niedermayer

Merge commit 'a801453423420915425f902bf9f9cbe982a55d87'

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

Conflicts:
	libavcodec/g2meet.c

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

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